Commit 0ad06e69 authored by Loren Merritt's avatar Loren Merritt
Browse files

fix: "x264 -A all" didn't include b8x8 types.

add: "make NDEBUG=1" to strip library
update TODO with B-frame status


git-svn-id: svn://svn.videolan.org/x264/trunk@84 df754926-b1dd-0310-bc7b-ec298dee348c
parent 53295729
...@@ -23,7 +23,12 @@ OBJASM= $(ASMSRC:%.asm=%.o) ...@@ -23,7 +23,12 @@ OBJASM= $(ASMSRC:%.asm=%.o)
endif endif
CC=gcc CC=gcc
CFLAGS=-g -Wall -I. -DDEBUG -O4 -funroll-loops -D__X264__ $(PFLAGS) CFLAGS=-Wall -I. -O4 -funroll-loops -D__X264__ $(PFLAGS)
ifdef NDEBUG
CFLAGS+=-s -DNDEBUG
else
CFLAGS+=-g -DDEBUG
endif
AS= nasm AS= nasm
# for linux # for linux
......
...@@ -20,16 +20,16 @@ General: ...@@ -20,16 +20,16 @@ General:
* Inter coding: * Inter coding:
- D_4x8 D_8x4 and D_4x4 ME P block -> done but too slow. - D_4x8 D_8x4 and D_4x4 ME P block -> done but too slow.
- B_ types. - B_SUB8x8 types.
- scene change detection. - better SKIP detection.
- long terme ? - long terme ?
- ... - ...
* B frame: B_L0/L1/BI work in cavlc (need more testing). * B frame: B_L0/L1/BI/SKIP/DIRECT work (need more testing).
-> need to do all others mb type (first B_DIRECT and B_SKIP) -> adaptive placement of B-frames
-> cabac -> look at weighted prediction (should give better result)
-> look at weighted prediction (should give bettter result)
-> better analyse algo (as always ;) -> better analyse algo (as always ;)
-> joint motion estimation of BI types
* Speed issue (oprofile is your friend) * Speed issue (oprofile is your friend)
- mc.c:30% and pixel.c:20% (mc is used by ME) - mc.c:30% and pixel.c:20% (mc is used by ME)
......
...@@ -365,7 +365,7 @@ static int Parse( int argc, char **argv, ...@@ -365,7 +365,7 @@ static int Parse( int argc, char **argv,
case 'A': case 'A':
param->analyse.inter = 0; param->analyse.inter = 0;
if( strstr( optarg, "none" ) ) param->analyse.inter = 0x000000; if( strstr( optarg, "none" ) ) param->analyse.inter = 0x000000;
if( strstr( optarg, "all" ) ) param->analyse.inter = X264_ANALYSE_I4x4|X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8; if( strstr( optarg, "all" ) ) param->analyse.inter = X264_ANALYSE_I4x4|X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8|X264_ANALYSE_BSUB16x16;
if( strstr( optarg, "i4x4" ) ) param->analyse.inter |= X264_ANALYSE_I4x4; if( strstr( optarg, "i4x4" ) ) param->analyse.inter |= X264_ANALYSE_I4x4;
if( strstr( optarg, "psub16x16" ) ) param->analyse.inter |= X264_ANALYSE_PSUB16x16; if( strstr( optarg, "psub16x16" ) ) param->analyse.inter |= X264_ANALYSE_PSUB16x16;
...@@ -407,7 +407,7 @@ static int Parse( int argc, char **argv, ...@@ -407,7 +407,7 @@ static int Parse( int argc, char **argv,
param->rc.b_stat_write = 1; param->rc.b_stat_write = 1;
else if( i_pass == 2 ) else if( i_pass == 2 )
param->rc.b_stat_read = 1; param->rc.b_stat_read = 1;
else if( i_pass > 2 ) /* XXX untested */ else if( i_pass > 2 )
param->rc.b_stat_read = param->rc.b_stat_read =
param->rc.b_stat_write = 1; param->rc.b_stat_write = 1;
break; break;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment