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

CrystalHD: Fix whitespace after previous change. 

'git diff -w' confirmed to return nothing.

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

58
libavcodec/crystalhd.c
View File

@ -814,37 +814,37 @@ 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 == RET_OK && *data_size == 0) { if (rec_ret == RET_OK && *data_size == 0) {
/* /*
* 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
* the pipeline stable, we should return nothing and wait for * the pipeline stable, we should return nothing and wait for
* the next time round to grab the second field. * the next time round to grab the second field.
* H.264 PAFF is an example of this. * H.264 PAFF is an example of this.
*/ */
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 if (rec_ret == RET_COPY_NEXT_FIELD) { } 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
* we grab the second field before returning, we'll slip another * we grab the second field before returning, we'll slip another
* frame in the pipeline and if that happens a lot, we're sunk. * frame in the pipeline and if that happens a lot, we're sunk.
* So we have to get that second field now. * So we have to get that second field now.
* Interlaced mpeg2 and vc1 are examples of this. * Interlaced mpeg2 and vc1 are examples of this.
*/ */
av_log(avctx, AV_LOG_VERBOSE, "Trying to get second field.\n"); av_log(avctx, AV_LOG_VERBOSE, "Trying to get second field.\n");
while (1) { while (1) {
usleep(priv->decode_wait); usleep(priv->decode_wait);
ret = DtsGetDriverStatus(dev, &decoder_status); ret = DtsGetDriverStatus(dev, &decoder_status);
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 == RET_OK && *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.