virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

CrystalHD: Handle different h.264 MBAFF packing.

Browse Source 
I found another MBAFF sample where the input:output pattern is
the same as mpeg2 and vc1 (fieldpair input, individual field output).
While I'm not sure how you can output individual fields from MBAFF,
if I apply the mpeg2/vc1 handling to this file, it plays correctly.

So, this changes the detection algorithm to handle the known cases.

Whitespace will be fixed in a separate change.

Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Philip Langdale 2011-03-27 09:37:49 -07:00
parent c0577ceb55
commit 9ce1d5f03b
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/crystalhd.c
View File

@ -102,10 +102,11 @@
****************************************************************************/ ****************************************************************************/
typedef enum { typedef enum {
RET_ERROR = -1, RET_ERROR = -1,
RET_OK = 0, RET_OK = 0,
RET_COPY_AGAIN = 1, RET_COPY_AGAIN = 1,
RET_SKIP_NEXT_COPY = 2, RET_SKIP_NEXT_COPY = 2,
RET_COPY_NEXT_FIELD = 3,
} CopyRet; } CopyRet;
typedef struct OpaqueList { typedef struct OpaqueList {
@ -624,7 +625,13 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
return RET_SKIP_NEXT_COPY; return RET_SKIP_NEXT_COPY;
} }
return RET_OK; /*
* Testing has shown that in all cases where we don't want to return the
* full frame immediately, VDEC_FLAG_UNKNOWN_SRC is set.
*/
return priv->need_second_field &&
!(output->PicInfo.flags & VDEC_FLAG_UNKNOWN_SRC) ?
RET_COPY_NEXT_FIELD : RET_OK;
} }
@ -806,8 +813,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a
do { do {
rec_ret = receive_frame(avctx, data, data_size, 0); rec_ret = receive_frame(avctx, data, data_size, 0);
if (rec_ret == 0 && *data_size == 0) { if (rec_ret == RET_OK && *data_size == 0) {
if (avctx->codec->id == CODEC_ID_H264) {
/* /*
* This case is for when the encoded fields are stored * This case is for when the encoded fields are stored
* separately and we get a separate avpkt for each one. To keep * separately and we get a separate avpkt for each one. To keep
@ -817,7 +823,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a
*/ */
av_log(avctx, AV_LOG_VERBOSE, "Returning after first field.\n"); av_log(avctx, AV_LOG_VERBOSE, "Returning after first field.\n");
avctx->has_b_frames--; avctx->has_b_frames--;
} else { } else if (rec_ret == RET_COPY_NEXT_FIELD) {
/* /*
* This case is for when the encoded fields are stored in a * This case is for when the encoded fields are stored in a
* single avpkt but the hardware returns then separately. Unless * single avpkt but the hardware returns then separately. Unless
@ -833,13 +839,12 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a
if (ret == BC_STS_SUCCESS && if (ret == BC_STS_SUCCESS &&
decoder_status.ReadyListCount > 0) { decoder_status.ReadyListCount > 0) {
rec_ret = receive_frame(avctx, data, data_size, 1); rec_ret = receive_frame(avctx, data, data_size, 1);
if ((rec_ret == 0 && *data_size > 0) || if ((rec_ret == RET_OK && *data_size > 0) ||
rec_ret == RET_ERROR) rec_ret == RET_ERROR)
break; break;
} }
} }
av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: Got second field.\n"); av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: Got second field.\n");
}
} else if (rec_ret == RET_SKIP_NEXT_COPY) { } else if (rec_ret == RET_SKIP_NEXT_COPY) {
/* /*
* Two input packets got turned into a field pair. Gawd. * Two input packets got turned into a field pair. Gawd.