Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/vp6.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * @file 2 * @file
3 * VP6 compatible video decoder 3 * VP6 compatible video decoder
4 * 4 *
5 * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> 5 * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
6 * 6 *
7 * The VP6F decoder accepts an optional 1 byte extradata. It is composed of: 7 * The VP6F decoder accepts an optional 1 byte extradata. It is composed of:
8 * - upper 4bits: difference between encoded width and visible width 8 * - upper 4bits: difference between encoded width and visible width
9 * - lower 4bits: difference between encoded height and visible height 9 * - lower 4bits: difference between encoded height and visible height
10 * 10 *
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 } 552 }
553 553
554 if (filter4) { 554 if (filter4) {
555 if (!y8) { /* left or right combine */ 555 if (!y8) { /* left or right combine */
556 vp6_filter_hv4(dst, src+offset1, stride, 1, 556 vp6_filter_hv4(dst, src+offset1, stride, 1,
557 vp6_block_copy_filter[select][x8]); 557 vp6_block_copy_filter[select][x8]);
558 } else if (!x8) { /* above or below combine */ 558 } else if (!x8) { /* above or below combine */
559 vp6_filter_hv4(dst, src+offset1, stride, stride, 559 vp6_filter_hv4(dst, src+offset1, stride, stride,
560 vp6_block_copy_filter[select][y8]); 560 vp6_block_copy_filter[select][y8]);
561 } else { 561 } else {
562 s->dsp.vp6_filter_diag4(dst, src+offset1+((mv.x^mv.y)>>31), stride, 562 s->vp56dsp.vp6_filter_diag4(dst, src+offset1+((mv.x^mv.y)>>31), stri de,
563 vp6_block_copy_filter[select][x8], 563 vp6_block_copy_filter[select][x8],
564 vp6_block_copy_filter[select][y8]); 564 vp6_block_copy_filter[select][y8]);
565 } 565 }
566 } else { 566 } else {
567 if (!x8 || !y8) { 567 if (!x8 || !y8) {
568 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8 , y8); 568 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8 , y8);
569 } else { 569 } else {
570 vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8 , y8); 570 vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8 , y8);
571 } 571 }
572 } 572 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 AVMEDIA_TYPE_VIDEO, 639 AVMEDIA_TYPE_VIDEO,
640 CODEC_ID_VP6A, 640 CODEC_ID_VP6A,
641 sizeof(VP56Context), 641 sizeof(VP56Context),
642 vp6_decode_init, 642 vp6_decode_init,
643 NULL, 643 NULL,
644 vp6_decode_free, 644 vp6_decode_free,
645 ff_vp56_decode_frame, 645 ff_vp56_decode_frame,
646 CODEC_CAP_DR1, 646 CODEC_CAP_DR1,
647 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channe l)"), 647 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channe l)"),
648 }; 648 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/vp56rac.c ('k') | source/patched-ffmpeg-mt/libavcodec/vp6dsp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698