diff options
| author | Ivan Maltz <ivanmaltz@google.com> | 2013-09-09 16:57:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-09 16:57:01 -0700 |
| commit | 20abe595ece7d2de6da641fcbf98b98a5674dc10 (patch) | |
| tree | b7da58044cb7751d628b0ca98751d7b7386548bf /vp9/encoder/vp9_onyx_int.h | |
| parent | c1913c9cf4a1f5a417349ad59dc81ca8397fd456 (diff) | |
| parent | 01b35c3c160e6158babfce046360bdc6a09d5c17 (diff) | |
| download | libvpx-20abe595ece7d2de6da641fcbf98b98a5674dc10.tar libvpx-20abe595ece7d2de6da641fcbf98b98a5674dc10.tar.gz libvpx-20abe595ece7d2de6da641fcbf98b98a5674dc10.tar.bz2 libvpx-20abe595ece7d2de6da641fcbf98b98a5674dc10.zip | |
Merge "API extensions and sample app for spacial scalable encoder"
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 252e98251..2dbd7a01a 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -351,6 +351,10 @@ typedef struct VP9_COMP { int lst_fb_idx; int gld_fb_idx; int alt_fb_idx; + + int current_layer; + int use_svc; + #if CONFIG_MULTIPLE_ARF int alt_ref_fb_idx[NUM_REF_FRAMES - 3]; #endif @@ -650,6 +654,8 @@ typedef struct VP9_COMP { int initial_width; int initial_height; + int number_spatial_layers; + #if CONFIG_MULTIPLE_ARF // ARF tracking variables. int multi_arf_enabled; @@ -684,6 +690,17 @@ static int get_ref_frame_idx(VP9_COMP *cpi, MV_REFERENCE_FRAME ref_frame) { } } +static int get_scale_ref_frame_idx(VP9_COMP *cpi, + MV_REFERENCE_FRAME ref_frame) { + if (ref_frame == LAST_FRAME) { + return 0; + } else if (ref_frame == GOLDEN_FRAME) { + return 1; + } else { + return 2; + } +} + void vp9_encode_frame(VP9_COMP *cpi); void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest, |