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

Side by Side Diff: libavcodec/h264_cabac.c

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 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
OLDNEW
1 /* 1 /*
2 * H.26L/H.264/AVC/JVT/14496-10/... cabac decoding 2 * H.26L/H.264/AVC/JVT/14496-10/... cabac decoding
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
11 * 11 *
12 * FFmpeg is distributed in the hope that it will be useful, 12 * FFmpeg is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details. 15 * Lesser General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Lesser General Public 17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software 18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */ 20 */
21 21
22 /** 22 /**
23 * @file 23 * @file
24 * H.264 / AVC / MPEG4 part10 cabac decoding. 24 * H.264 / AVC / MPEG4 part10 cabac decoding.
25 * @author Michael Niedermayer <michaelni@gmx.at> 25 * @author Michael Niedermayer <michaelni@gmx.at>
26 */ 26 */
27 27
28 #define CABAC 1 28 #define CABAC 1
29 #define UNCHECKED_BITSTREAM_READER 1
30 29
31 #include "config.h" 30 #include "config.h"
32 #include "cabac.h" 31 #include "cabac.h"
33 #include "cabac_functions.h" 32 #include "cabac_functions.h"
34 #include "internal.h" 33 #include "internal.h"
35 #include "dsputil.h" 34 #include "dsputil.h"
36 #include "avcodec.h" 35 #include "avcodec.h"
37 #include "h264.h" 36 #include "h264.h"
38 #include "h264data.h" 37 #include "h264data.h"
39 #include "h264_mvpred.h" 38 #include "h264_mvpred.h"
(...skipping 2377 matching lines...) Expand 10 before | Expand all | Expand 10 after
2417 s->current_picture.f.qscale_table[mb_xy] = s->qscale; 2416 s->current_picture.f.qscale_table[mb_xy] = s->qscale;
2418 write_back_non_zero_count(h); 2417 write_back_non_zero_count(h);
2419 2418
2420 if(MB_MBAFF){ 2419 if(MB_MBAFF){
2421 h->ref_count[0] >>= 1; 2420 h->ref_count[0] >>= 1;
2422 h->ref_count[1] >>= 1; 2421 h->ref_count[1] >>= 1;
2423 } 2422 }
2424 2423
2425 return 0; 2424 return 0;
2426 } 2425 }
OLDNEW
« configure ('K') | « libavcodec/h264.c ('k') | libavcodec/h264_cavlc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698