comparison vp3.c @ 1667:720c073661a1 libavcodec

FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
author alex
date Mon, 08 Dec 2003 18:26:22 +0000
parents 1c7ded3c2b25
children 9a73e6dc5d68
comparison
equal deleted inserted replaced
1666:b76ab3c968ab 1667:720c073661a1
2404 av_log(s->avctx, AV_LOG_ERROR, " vp3:render_fragments(): bad fragment number (%d)\n", i); 2404 av_log(s->avctx, AV_LOG_ERROR, " vp3:render_fragments(): bad fragment number (%d)\n", i);
2405 return; 2405 return;
2406 } 2406 }
2407 2407
2408 /* transform if this block was coded */ 2408 /* transform if this block was coded */
2409 if (s->all_fragments[i].coding_method != MODE_COPY) { 2409 if ((s->all_fragments[i].coding_method != MODE_COPY) &&
2410 !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {
2410 2411
2411 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || 2412 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
2412 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) 2413 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
2413 motion_source= golden_plane; 2414 motion_source= golden_plane;
2414 else 2415 else
2790 s->last_quality_index = s->quality_index; 2791 s->last_quality_index = s->quality_index;
2791 s->quality_index = get_bits(&gb, 6); 2792 s->quality_index = get_bits(&gb, 6);
2792 if (s->theora >= 0x030300) 2793 if (s->theora >= 0x030300)
2793 skip_bits1(&gb); 2794 skip_bits1(&gb);
2794 2795
2795 debug_vp3(" VP3 %sframe #%d: Q index = %d\n", 2796 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
2796 s->keyframe?"key":"", counter, s->quality_index); 2797 av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
2798 s->keyframe?"key":"", counter, s->quality_index);
2797 counter++; 2799 counter++;
2798 2800
2799 if (s->quality_index != s->last_quality_index) 2801 if (s->quality_index != s->last_quality_index)
2800 init_dequantizer(s); 2802 init_dequantizer(s);
2801 2803