Commit effd2e72 authored by Steinar H. Gunderson's avatar Steinar H. Gunderson Committed by James Almer

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: 's avatarJames Almer <jamrial@gmail.com>
parent 4ff94558
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment