Merge pull request discord#126 from discord/wmcd/length

Set contentLength field in all ImageHeaders
skidder · Apr 17, 2023 · 5787bc9 · 5787bc9
2 parents b084235 + d8d3ecc
commit 5787bc9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/avcodec.go b/avcodec.go
@@ -64,11 +64,12 @@ func (d *avCodecDecoder) Duration() time.Duration {
 
 func (d *avCodecDecoder) Header() (*ImageHeader, error) {
 	return &ImageHeader{
-		width:       int(C.avcodec_decoder_get_width(d.decoder)),
-		height:      int(C.avcodec_decoder_get_height(d.decoder)),
-		pixelType:   PixelType(C.CV_8UC4),
-		orientation: ImageOrientation(C.avcodec_decoder_get_orientation(d.decoder)),
-		numFrames:   1,
+		width:         int(C.avcodec_decoder_get_width(d.decoder)),
+		height:        int(C.avcodec_decoder_get_height(d.decoder)),
+		pixelType:     PixelType(C.CV_8UC4),
+		orientation:   ImageOrientation(C.avcodec_decoder_get_orientation(d.decoder)),
+		numFrames:     1,
+		contentLength: len(d.buf),
 	}, nil
 }
 

diff --git a/giflib.go b/giflib.go
@@ -72,21 +72,23 @@ func newGifDecoder(buf []byte) (*gifDecoder, error) {
 
 func (d *gifDecoder) Header() (*ImageHeader, error) {
 	return &ImageHeader{
-		width:       int(C.giflib_decoder_get_width(d.decoder)),
-		height:      int(C.giflib_decoder_get_height(d.decoder)),
-		pixelType:   PixelType(C.CV_8UC4),
-		orientation: OrientationTopLeft,
-		numFrames:   int(C.giflib_decoder_get_num_frames(d.decoder)),
+		width:         int(C.giflib_decoder_get_width(d.decoder)),
+		height:        int(C.giflib_decoder_get_height(d.decoder)),
+		pixelType:     PixelType(C.CV_8UC4),
+		orientation:   OrientationTopLeft,
+		numFrames:     int(C.giflib_decoder_get_num_frames(d.decoder)),
+		contentLength: len(d.buf),
 	}, nil
 }
 
 func (d *gifDecoder) FrameHeader() (*ImageHeader, error) {
 	return &ImageHeader{
-		width:       int(C.giflib_decoder_get_frame_width(d.decoder)),
-		height:      int(C.giflib_decoder_get_frame_height(d.decoder)),
-		pixelType:   PixelType(C.CV_8UC4),
-		orientation: OrientationTopLeft,
-		numFrames:   1,
+		width:         int(C.giflib_decoder_get_frame_width(d.decoder)),
+		height:        int(C.giflib_decoder_get_frame_height(d.decoder)),
+		pixelType:     PixelType(C.CV_8UC4),
+		orientation:   OrientationTopLeft,
+		numFrames:     1,
+		contentLength: len(d.buf),
 	}, nil
 }