RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

speedhq: fix behavior of single-field decoding 

The height convention for decoding frames with only a single field made sense
for compatibility with legacy decoders, but doesn't really match the convention
used by NDI, which is the primary (only?) user. Thus, change it to simply
assuming that if the two fields overlap, the frame is meant to be a single
field and the frame height matches the field height.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Steinar H. Gunderson 2017-08-03 09:22:57 +02:00 committed by James Almer
parent 4ff94558f2
commit effd2e7291
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/speedhq.c
View File

@ -450,10 +450,13 @@ static int speedhq_decode_frame(AVCodecContext *avctx,
if (second_field_offset == 4) {
/*
* Overlapping first and second fields is used to signal
* encoding only a single field (the second field then comes
* as a separate, later frame).
* encoding only a single field. In this case, "height"
* is ambiguous; it could mean either the height of the
* frame as a whole, or of the field. The former would make
* more sense for compatibility with legacy decoders,
* but this matches the convention used in NDI, which is
* the primary user of this trick.
*/
frame->height >>= 1;
if ((ret = decode_speedhq_field(s, buf, buf_size, frame, 0, 4, buf_size, 1)) < 0)
return ret;
} else {