mozilla
/
aom
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
aom/av1/common/entropymode.h

281 строка
10 KiB
C
Исходник Обычный вид История

Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
/*
Change to use AOM copyright notice Change-Id: I2b2b70e756b7eb9611b7b33b7d5f19b3b30e0a50
2016-09-02 22:04:54 +03:00
* Copyright (c) 2016, Alliance for Open Media. All rights reserved
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
*
Change to use AOM copyright notice Change-Id: I2b2b70e756b7eb9611b7b33b7d5f19b3b30e0a50
2016-09-02 22:04:54 +03:00
* This source code is subject to the terms of the BSD 2 Clause License and
* the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
* was not distributed with this source code in the LICENSE file, you can
* obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
*/
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
#ifndef AV1_COMMON_ENTROPYMODE_H_
#define AV1_COMMON_ENTROPYMODE_H_
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
Port folder renaming changes from AOM Manually cherry-picked commits: ceef058 libvpx->libaom part2 3d26d91 libvpx -> libaom cfea7dd vp10/ -> av1/ 3a8eff7 Fix a build issue for a test bf4202e Rename vpx to aom Change-Id: I1b0eb5a40796e3aaf41c58984b4229a439a597dc
2016-08-23 02:08:15 +03:00
#include "av1/common/entropy.h"
#include "av1/common/entropymv.h"
#include "av1/common/filter.h"
#include "av1/common/seg_common.h"
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
#include "aom_dsp/aom_filter.h"
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
#ifdef __cplusplus
extern "C" {
#endif
#define BLOCK_SIZE_GROUPS 4
#define TX_SIZE_CONTEXTS 2
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
#define INTER_OFFSET(mode) ((mode)-NEARESTMV)
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#if CONFIG_EXT_INTER
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
#define INTER_COMPOUND_OFFSET(mode) ((mode)-NEAREST_NEARESTMV)
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#endif // CONFIG_EXT_INTER
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
Bring palette back to nextgenv2 It was removed by the master branch merge. Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
2015-12-08 05:18:57 +03:00
#define PALETTE_COLOR_CONTEXTS 16
#define PALETTE_MAX_SIZE 8
Extend superblock size fo 128x128 pixels. If --enable-ext-partition is used at build time, the superblock size (sometimes also referred to as coding unit (CU) size) is extended to 128x128 pixels. Change-Id: Ie09cec6b7e8d765b7555ff5d80974aab60803f3a
2016-03-07 16:46:39 +03:00
#define PALETTE_BLOCK_SIZES (BLOCK_LARGEST - BLOCK_8X8 + 1)
Bring palette back to nextgenv2 It was removed by the master branch merge. Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
2015-12-08 05:18:57 +03:00
#define PALETTE_Y_MODE_CONTEXTS 3
Set block size upper bound for Palette mode Avoid buffer overflow in case of such new experiments as 128 x 128 superblock size. Change-Id: Ib775f3925a85fc87227c0ddd9b6a6110a12ef196
2016-03-30 02:28:28 +03:00
#define PALETTE_MAX_BLOCK_SIZE (64 * 64)
Bring palette back to nextgenv2 It was removed by the master branch merge. Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
2015-12-08 05:18:57 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
struct AV1Common;
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
vp10: make segmentation probs use generic probability model. Locate them (code-wise) in frame_context, and have them be updated as any other probability using the subexp forward and adaptive bw updates. See issue 1040 point 1. TODOs: - real-world default probabilities - why is counts sometimes NULL in the decoder? Does that mean bw adaptivity updates only work on some frames? (I haven't looked very closely yet, maybe this is a red herring.) Change-Id: I23b57b4e5e7574b75f16eb64823b29c22fbab42e
2015-10-13 21:06:28 +03:00
struct seg_counts {
unsigned int tree_total[MAX_SEGMENTS];
unsigned int tree_mispred[MAX_SEGMENTS];
unsigned int pred[PREDICTION_PROBS][2];
};
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
typedef struct frame_contexts {
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob y_mode_prob[BLOCK_SIZE_GROUPS][INTRA_MODES - 1];
aom_prob uv_mode_prob[INTRA_MODES][INTRA_MODES - 1];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#if CONFIG_EXT_PARTITION_TYPES
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob partition_prob[PARTITION_CONTEXTS][EXT_PARTITION_TYPES - 1];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#else
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob partition_prob[PARTITION_CONTEXTS][PARTITION_TYPES - 1];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
av1_coeff_probs_model coef_probs[TX_SIZES][PLANE_TYPES];
Store ANS token CDFs in the FRAME_CONTEXT rather than in a global table. This will facilitate bringing the zero node into the token set while allowing its probability to vary independently. Change-Id: I57b44c0fce44debb8e612021e44713b229d1b3cf
2016-02-19 23:51:15 +03:00
#if CONFIG_ANS
coeff_cdf_model coef_cdfs[TX_SIZES][PLANE_TYPES];
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS][SWITCHABLE_FILTERS -
1];
Re-design motion compensated prediction mode entropy coding system This commit re-works the entropy coding scheme of the motion compensated prediction modes. It allows more flexible hyperplane partition for precise classification. Change-Id: Iba5035c76691946cf1386b6c495e399c3d9c8fc5
2015-12-02 21:59:01 +03:00
#if CONFIG_REF_MV
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob newmv_prob[NEWMV_MODE_CONTEXTS];
aom_prob zeromv_prob[ZEROMV_MODE_CONTEXTS];
aom_prob refmv_prob[REFMV_MODE_CONTEXTS];
aom_prob drl_prob[DRL_MODE_CONTEXTS];
Entropy coding for dynamic ref mv modes This commit enables entropy coding for dynamic reference motion vector modes. The probability model is contexted on the ranking categories of the reference motion vector candidates. Change-Id: I09b58d98a409d63ec1a407331e29f8945b7ef17d
2016-01-22 05:07:31 +03:00
EXT_INTER experiment NEW2MV is enabled, representing a new motion vector predicted from NEARMV. It is mostly ported from nextgen, where it was named NEW_INTER. A few fixes are done for sub8x8 RDO to correct some misused mv references in the original patch. A 'bug-fix' for encoding complexity is done, reducing the additional encoding time from 50% to 20%. In sub8x8 case, the old patch did motion search for every interpolation filter (vp9 only searches once). This fix also slightly improves the coding gain. This experiment has been made compatible with REF_MV and EXT_REFS. Coding gain (derflr/hevcmr/hevchd): 0.267%/0.542%/0.257% Change-Id: I9a94c5f292e7454492a877f65072e8aedba087d4
2016-01-08 02:13:52 +03:00
#if CONFIG_EXT_INTER
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob new2mv_prob;
EXT_INTER experiment NEW2MV is enabled, representing a new motion vector predicted from NEARMV. It is mostly ported from nextgen, where it was named NEW_INTER. A few fixes are done for sub8x8 RDO to correct some misused mv references in the original patch. A 'bug-fix' for encoding complexity is done, reducing the additional encoding time from 50% to 20%. In sub8x8 case, the old patch did motion search for every interpolation filter (vp9 only searches once). This fix also slightly improves the coding gain. This experiment has been made compatible with REF_MV and EXT_REFS. Coding gain (derflr/hevcmr/hevchd): 0.267%/0.542%/0.257% Change-Id: I9a94c5f292e7454492a877f65072e8aedba087d4
2016-01-08 02:13:52 +03:00
#endif // CONFIG_EXT_INTER
Adds compound wedge prediction modes Incorporates wedge compound prediction modes. Change-Id: Ie73b54b629105b9dcc5f3763be87f35b09ad2ec7
2016-03-01 03:08:07 +03:00
#endif // CONFIG_REF_MV
Re-design motion compensated prediction mode entropy coding system This commit re-works the entropy coding scheme of the motion compensated prediction modes. It allows more flexible hyperplane partition for precise classification. Change-Id: Iba5035c76691946cf1386b6c495e399c3d9c8fc5
2015-12-02 21:59:01 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob inter_mode_probs[INTER_MODE_CONTEXTS][INTER_MODES - 1];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#if CONFIG_EXT_INTER
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
inter_compound_mode_probs[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES - 1];
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob interintra_prob[BLOCK_SIZE_GROUPS];
aom_prob interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1];
aom_prob wedge_interintra_prob[BLOCK_SIZES];
aom_prob wedge_interinter_prob[BLOCK_SIZES];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#endif // CONFIG_EXT_INTER
Some refactoring to support warped motion mode Change-Id: I15d54a3ae48b2b33082668116792c6595bdb3ddb
2016-06-09 10:57:09 +03:00
#if CONFIG_OBMC || CONFIG_WARPED_MOTION
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob motvar_prob[BLOCK_SIZES][MOTION_VARIATIONS - 1];
Some refactoring to support warped motion mode Change-Id: I15d54a3ae48b2b33082668116792c6595bdb3ddb
2016-06-09 10:57:09 +03:00
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob intra_inter_prob[INTRA_INTER_CONTEXTS];
aom_prob comp_inter_prob[COMP_INTER_CONTEXTS];
aom_prob single_ref_prob[REF_CONTEXTS][SINGLE_REFS - 1];
Merge bi-predictive frames to EXT_REFS This patch removed the experiment of BIDIR_PRED and merged the feature into the experiment of EXT_REFS: (1) Each frame now has up to 6 reference frames, namely LAST_FRAME, LAST2_FRAME, LAST3_FRAME, GOLDEN_FRAME, (forward) and BWDREF_FRAME, ALTREF_FRAME (backward); LAST4_FRAME has been removed; (2) First pass still keeps the 8 updates: KF_UPDATE, LF_UPDATE, GF_UPDATE, ARF_UPDATE, OVERLAY_UPDATE, and BRF_UPDATE, LAST_BIPRED_UPDATE, BI_PRED_UPDATE; (3) show_existing_frame==1 is supported in the experiment of EXT_REFS; (4) New encoding modes are added for both single-ref and compound cases, through the use of the 2 extra forward references (LAST2 & LAST3) and the 1 extra backward reference (BWDREF). RD performance wise, using Overall PSNR: Avg/BDRate Bipred only Prev EXT_REFS Current EXT_REFS with bipred lowres: -3.474/-3.324 -1.748/-1.586 -4.613/-4.387 derflr: -2.097/-1.353 -1.439/-1.215 -3.120/-2.252 midres: -2.129/-1.901 -1.345/-1.185 -2.898/-2.636 If in vp10/encoder/firstpass.h, change BFG_INTERVAL from 2 to 3, i.e. to use 2 bi-predictive frames than 1, a further improvement may be obtained: Current EXT_REFS with bipred 1 bi-predictive frame 2 bi-predictive frames lowres: -4.613/-4.387 -4.675/-4.465 derflr: -3.120/-2.252 -3.333/-2.516 midres: -2.898/-2.636 -3.406/-3.095 Change-Id: Ib06fe9ea0a5cfd7418a1d79b978ee9d80bf191cb
2016-06-09 00:27:56 +03:00
#if CONFIG_EXT_REFS
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob comp_ref_prob[REF_CONTEXTS][FWD_REFS - 1];
aom_prob comp_bwdref_prob[REF_CONTEXTS][BWD_REFS - 1];
Added an experiment "bidir_pred" for backward prediction Major parts have been implemented as follows: (1) Added BRF_UPDATE, LASTNRF_UPDATE, and NRF_UPDATE in firstpass.c; (2) Added the handling for the scenario of "cpi->common.show_existing_frame == 1" at the encoder; (3) Added a new reference frame of BWDREF_FRAME; (4) Have bwd-ref work with upsampled references. Note that when the experiment of "ext_refs" turned on, this experiment will be turned off automatically currently. RD performance in Overall PSNR has been improved, compared against the VP10 baseline: lowres: Avg -3.312; BDRate -3.154 derflr: Avg -1.927; BDRate -1.176 midres: Avg -2.149; BDRate -2.001 hdres : Avg -0.567; BDRate -0.588 Change-Id: I4c06ff51cc20194bffbd4d2346e57ba3dcf6b62c
2016-02-04 20:47:46 +03:00
#else
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob comp_ref_prob[REF_CONTEXTS][COMP_REFS - 1];
Merge bi-predictive frames to EXT_REFS This patch removed the experiment of BIDIR_PRED and merged the feature into the experiment of EXT_REFS: (1) Each frame now has up to 6 reference frames, namely LAST_FRAME, LAST2_FRAME, LAST3_FRAME, GOLDEN_FRAME, (forward) and BWDREF_FRAME, ALTREF_FRAME (backward); LAST4_FRAME has been removed; (2) First pass still keeps the 8 updates: KF_UPDATE, LF_UPDATE, GF_UPDATE, ARF_UPDATE, OVERLAY_UPDATE, and BRF_UPDATE, LAST_BIPRED_UPDATE, BI_PRED_UPDATE; (3) show_existing_frame==1 is supported in the experiment of EXT_REFS; (4) New encoding modes are added for both single-ref and compound cases, through the use of the 2 extra forward references (LAST2 & LAST3) and the 1 extra backward reference (BWDREF). RD performance wise, using Overall PSNR: Avg/BDRate Bipred only Prev EXT_REFS Current EXT_REFS with bipred lowres: -3.474/-3.324 -1.748/-1.586 -4.613/-4.387 derflr: -2.097/-1.353 -1.439/-1.215 -3.120/-2.252 midres: -2.129/-1.901 -1.345/-1.185 -2.898/-2.636 If in vp10/encoder/firstpass.h, change BFG_INTERVAL from 2 to 3, i.e. to use 2 bi-predictive frames than 1, a further improvement may be obtained: Current EXT_REFS with bipred 1 bi-predictive frame 2 bi-predictive frames lowres: -4.613/-4.387 -4.675/-4.465 derflr: -3.120/-2.252 -3.333/-2.516 midres: -2.898/-2.636 -3.406/-3.095 Change-Id: Ib06fe9ea0a5cfd7418a1d79b978ee9d80bf191cb
2016-06-09 00:27:56 +03:00
#endif // CONFIG_EXT_REFS
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob tx_size_probs[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES - 1];
Enable entropy coding of recursive transform block partition This commit enables the entropy coding of the recursive transform block partition syntax. Change-Id: I0c2509fb7b9822d12a721f9ebf9327fac83c777e
2015-10-14 19:38:17 +03:00
#if CONFIG_VAR_TX
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob txfm_partition_prob[TXFM_PARTITION_CONTEXTS];
Enable entropy coding of recursive transform block partition This commit enables the entropy coding of the recursive transform block partition syntax. Change-Id: I0c2509fb7b9822d12a721f9ebf9327fac83c777e
2015-10-14 19:38:17 +03:00
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob skip_probs[SKIP_CONTEXTS];
Vectorize motion vector probability models This commit converts the scalar motion vector probability model into vector format for later precise estimate. Change-Id: I7008d047ecc1b9577aa8442b4db2df312be869dc
2016-02-18 22:57:44 +03:00
#if CONFIG_REF_MV
nmv_context nmvc[NMV_CONTEXTS];
#else
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
nmv_context nmvc;
Vectorize motion vector probability models This commit converts the scalar motion vector probability model into vector format for later precise estimate. Change-Id: I7008d047ecc1b9577aa8442b4db2df312be869dc
2016-02-18 22:57:44 +03:00
#endif
ext-intra experiment Currently there are two parts in this experiment: extra directional intra prediction modes and the filter intra modes migrated from the nextgen branch. Several macros are defined in "blockd.h" to provide controls of the experiment settings. Setting "DR_ONLY" as 1 (default is 0) means we only use directional modes, and skip the filter-intra modes; "EXT_INTRA_ANGLES" (default is 128) defines the number of different angles we want to support; setting "ANGLE_FAST_SEARCH" as 1 (default is 1) means we use fast sub-optimal search for the best prediction angle, instead of exhaustive search. The fast search is about 6 times faster than the exhaustive search, while preserving about 60% of the coding gains. With extra directional prediction modes (fast search), we observe the following code gains (number in parentheses is for all-key-frame setting): derflr +0.42% (+1.79%) hevclr +0.78% (+2.19%) hevcmr +1.20% (+3.49%) stdhd +0.56% Speed-wise, about 110% slower for key frames, and 30% slower overall. The gains of filter intra modes mostly add up with the gains of directional modes. The overall coding gain of this experiment: derflr +0.94% hevclr +1.46% hevcmr +1.94% stdhd +1.58% Change-Id: Ida9ad00cdb33aff422d06eb42b4f4e5f25df8a2a
2015-10-07 19:29:02 +03:00
int initialized;
Backport EXT_TX experiment from nextgen Does not include DST1 yet. derflr: +1.437 (8-bit internal), +7.243 (12-bit internal) with --enable-ext-tx Change-Id: I91f1759fd2de794755eb6384cda52e80e979cb7d
2015-09-03 12:58:12 +03:00
#if CONFIG_EXT_TX
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob inter_ext_tx_prob[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES - 1];
aom_prob
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
intra_ext_tx_prob[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][TX_TYPES -
1];
Merge branch 'master' into nextgenv2 Manually resovled the following conflicts: vp10/common/blockd.h vp10/common/entropy.h vp10/common/entropymode.c vp10/common/entropymode.h vp10/common/enums.h vp10/common/thread_common.c vp10/decoder/decodeframe.c vp10/decoder/decodemv.c vp10/encoder/bitstream.c vp10/encoder/encodeframe.c vp10/encoder/rd.c vp10/encoder/rdopt.c Change-Id: I15d20ce5292b70f0c2b4ba55c1f1318181481596
2016-01-11 21:27:35 +03:00
#else
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob intra_ext_tx_prob[EXT_TX_SIZES][TX_TYPES][TX_TYPES - 1];
aom_prob inter_ext_tx_prob[EXT_TX_SIZES][TX_TYPES - 1];
Backport EXT_TX experiment from nextgen Does not include DST1 yet. derflr: +1.437 (8-bit internal), +7.243 (12-bit internal) with --enable-ext-tx Change-Id: I91f1759fd2de794755eb6384cda52e80e979cb7d
2015-09-03 12:58:12 +03:00
#endif // CONFIG_EXT_TX
Super transform - ported from nextgen branch Various additional changes were made to make the experiment compatible with misc_fixes. derflr: +0.979% hevcmr: +0.865% Speed-wise with --enable-supertx the encoder is only about 10% slower than without. Decoding impact is about 30% slowdown. Note this does not work with ext-tx or var-tx yet. That is a TODO. Change-Id: If25af4241a7a9efbd28f58eda3c4f044c7a7ef4b
2015-11-20 03:51:16 +03:00
#if CONFIG_SUPERTX
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob supertx_prob[PARTITION_SUPERTX_CONTEXTS][TX_SIZES];
Super transform - ported from nextgen branch Various additional changes were made to make the experiment compatible with misc_fixes. derflr: +0.979% hevcmr: +0.865% Speed-wise with --enable-supertx the encoder is only about 10% slower than without. Decoding impact is about 30% slowdown. Note this does not work with ext-tx or var-tx yet. That is a TODO. Change-Id: If25af4241a7a9efbd28f58eda3c4f044c7a7ef4b
2015-11-20 03:51:16 +03:00
#endif // CONFIG_SUPERTX
vp10: make segmentation probs use generic probability model. Locate them (code-wise) in frame_context, and have them be updated as any other probability using the subexp forward and adaptive bw updates. See issue 1040 point 1. TODOs: - real-world default probabilities - why is counts sometimes NULL in the decoder? Does that mean bw adaptivity updates only work on some frames? (I haven't looked very closely yet, maybe this is a red herring.) Change-Id: I23b57b4e5e7574b75f16eb64823b29c22fbab42e
2015-10-13 21:06:28 +03:00
struct segmentation_probs seg;
ext-intra experiment Currently there are two parts in this experiment: extra directional intra prediction modes and the filter intra modes migrated from the nextgen branch. Several macros are defined in "blockd.h" to provide controls of the experiment settings. Setting "DR_ONLY" as 1 (default is 0) means we only use directional modes, and skip the filter-intra modes; "EXT_INTRA_ANGLES" (default is 128) defines the number of different angles we want to support; setting "ANGLE_FAST_SEARCH" as 1 (default is 1) means we use fast sub-optimal search for the best prediction angle, instead of exhaustive search. The fast search is about 6 times faster than the exhaustive search, while preserving about 60% of the coding gains. With extra directional prediction modes (fast search), we observe the following code gains (number in parentheses is for all-key-frame setting): derflr +0.42% (+1.79%) hevclr +0.78% (+2.19%) hevcmr +1.20% (+3.49%) stdhd +0.56% Speed-wise, about 110% slower for key frames, and 30% slower overall. The gains of filter intra modes mostly add up with the gains of directional modes. The overall coding gain of this experiment: derflr +0.94% hevclr +1.46% hevcmr +1.94% stdhd +1.58% Change-Id: Ida9ad00cdb33aff422d06eb42b4f4e5f25df8a2a
2015-10-07 19:29:02 +03:00
#if CONFIG_EXT_INTRA
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob ext_intra_probs[PLANE_TYPES];
aom_prob intra_filter_probs[INTRA_FILTERS + 1][INTRA_FILTERS - 1];
ext-intra experiment Currently there are two parts in this experiment: extra directional intra prediction modes and the filter intra modes migrated from the nextgen branch. Several macros are defined in "blockd.h" to provide controls of the experiment settings. Setting "DR_ONLY" as 1 (default is 0) means we only use directional modes, and skip the filter-intra modes; "EXT_INTRA_ANGLES" (default is 128) defines the number of different angles we want to support; setting "ANGLE_FAST_SEARCH" as 1 (default is 1) means we use fast sub-optimal search for the best prediction angle, instead of exhaustive search. The fast search is about 6 times faster than the exhaustive search, while preserving about 60% of the coding gains. With extra directional prediction modes (fast search), we observe the following code gains (number in parentheses is for all-key-frame setting): derflr +0.42% (+1.79%) hevclr +0.78% (+2.19%) hevcmr +1.20% (+3.49%) stdhd +0.56% Speed-wise, about 110% slower for key frames, and 30% slower overall. The gains of filter intra modes mostly add up with the gains of directional modes. The overall coding gain of this experiment: derflr +0.94% hevclr +1.46% hevcmr +1.94% stdhd +1.58% Change-Id: Ida9ad00cdb33aff422d06eb42b4f4e5f25df8a2a
2015-10-07 19:29:02 +03:00
#endif // CONFIG_EXT_INTRA
Add global motion parameters to compressed header Currently nothing is implemented to compute GM parameters, this just adds the capability to send them in the bitstream if they were computed. Still need to implement the reconstruction based on the parameters in reconinter. Change-Id: I72aea3c6a9de9f5a40f96da76c82b54a52781fe2
2016-07-11 21:47:55 +03:00
#if CONFIG_GLOBAL_MOTION
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
aom_prob global_motion_types_prob[GLOBAL_MOTION_TYPES - 1];
Add global motion parameters to compressed header Currently nothing is implemented to compute GM parameters, this just adds the capability to send them in the bitstream if they were computed. Still need to implement the reconstruction based on the parameters in reconinter. Change-Id: I72aea3c6a9de9f5a40f96da76c82b54a52781fe2
2016-07-11 21:47:55 +03:00
#endif // CONFIG_GLOBAL_MOTION
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
} FRAME_CONTEXT;
typedef struct FRAME_COUNTS {
Fix vp10_accumulate_frame_counts once and for all. This ensures the multi-threaded and single-threaded encoder/decoder always uses the same probability contexts. Change-Id: I6f1e7c6bd8808c390c1dc0a628ae97db3acedf6d
2016-05-04 13:30:36 +03:00
// Note: This structure should only contain 'unsigned int' fields, or
// aggregates built solely from 'unsigned int' fields/elements
vp10: allow forward updates for keyframe y intra mode probabilities. See issue 1040 point 5. Change-Id: I51a70b9eade39efba392a1457bd70a3c515525cb
2015-10-13 21:08:24 +03:00
unsigned int kf_y_mode[INTRA_MODES][INTRA_MODES][INTRA_MODES];
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
unsigned int y_mode[BLOCK_SIZE_GROUPS][INTRA_MODES];
unsigned int uv_mode[INTRA_MODES][INTRA_MODES];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#if CONFIG_EXT_PARTITION_TYPES
unsigned int partition[PARTITION_CONTEXTS][EXT_PARTITION_TYPES];
#else
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
unsigned int partition[PARTITION_CONTEXTS][PARTITION_TYPES];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
av1_coeff_count_model coef[TX_SIZES][PLANE_TYPES];
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
unsigned int
eob_branch[TX_SIZES][PLANE_TYPES][REF_TYPES][COEF_BANDS][COEFF_CONTEXTS];
unsigned int
switchable_interp[SWITCHABLE_FILTER_CONTEXTS][SWITCHABLE_FILTERS];
Re-design motion compensated prediction mode entropy coding system This commit re-works the entropy coding scheme of the motion compensated prediction modes. It allows more flexible hyperplane partition for precise classification. Change-Id: Iba5035c76691946cf1386b6c495e399c3d9c8fc5
2015-12-02 21:59:01 +03:00
#if CONFIG_REF_MV
unsigned int newmv_mode[NEWMV_MODE_CONTEXTS][2];
unsigned int zeromv_mode[ZEROMV_MODE_CONTEXTS][2];
unsigned int refmv_mode[REFMV_MODE_CONTEXTS][2];
Rework the DRL syntax entropy coding system This commit re-designs the probability model for the syntax elements of the dynamic motion vector referencing system. Change-Id: Icfb8203c7e8f64e10e99f5890e25e6f6b15fe5d1
2016-03-17 21:26:52 +03:00
unsigned int drl_mode[DRL_MODE_CONTEXTS][2];
EXT_INTER experiment NEW2MV is enabled, representing a new motion vector predicted from NEARMV. It is mostly ported from nextgen, where it was named NEW_INTER. A few fixes are done for sub8x8 RDO to correct some misused mv references in the original patch. A 'bug-fix' for encoding complexity is done, reducing the additional encoding time from 50% to 20%. In sub8x8 case, the old patch did motion search for every interpolation filter (vp9 only searches once). This fix also slightly improves the coding gain. This experiment has been made compatible with REF_MV and EXT_REFS. Coding gain (derflr/hevcmr/hevchd): 0.267%/0.542%/0.257% Change-Id: I9a94c5f292e7454492a877f65072e8aedba087d4
2016-01-08 02:13:52 +03:00
#if CONFIG_EXT_INTER
unsigned int new2mv_mode[2];
#endif // CONFIG_EXT_INTER
Re-design motion compensated prediction mode entropy coding system This commit re-works the entropy coding scheme of the motion compensated prediction modes. It allows more flexible hyperplane partition for precise classification. Change-Id: Iba5035c76691946cf1386b6c495e399c3d9c8fc5
2015-12-02 21:59:01 +03:00
#endif
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
unsigned int inter_mode[INTER_MODE_CONTEXTS][INTER_MODES];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#if CONFIG_EXT_INTER
unsigned int inter_compound_mode[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES];
Refactoring and cosmetic changes to ext-inter expt Change-Id: Icd457480744b7734b3c412c9fed43be738373334
2016-03-31 03:33:15 +03:00
unsigned int interintra[BLOCK_SIZE_GROUPS][2];
Fix interpolation values and decouple interintra Decouples interintra modes and probability models from regular intra modes, to enable creating/optimizing new interintra modes. Also, fixes interpolation values for 128x128 interintra and obmc. Change-Id: I5c2016db49b8f029164e5fe84c6274d4e02ff90e
2016-03-31 03:33:15 +03:00
unsigned int interintra_mode[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
Adds compound wedge prediction modes Incorporates wedge compound prediction modes. Change-Id: Ie73b54b629105b9dcc5f3763be87f35b09ad2ec7
2016-03-01 03:08:07 +03:00
unsigned int wedge_interintra[BLOCK_SIZES][2];
unsigned int wedge_interinter[BLOCK_SIZES][2];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#endif // CONFIG_EXT_INTER
Some refactoring to support warped motion mode Change-Id: I15d54a3ae48b2b33082668116792c6595bdb3ddb
2016-06-09 10:57:09 +03:00
#if CONFIG_OBMC || CONFIG_WARPED_MOTION
unsigned int motvar[BLOCK_SIZES][MOTION_VARIATIONS];
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
unsigned int intra_inter[INTRA_INTER_CONTEXTS][2];
unsigned int comp_inter[COMP_INTER_CONTEXTS][2];
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
unsigned int single_ref[REF_CONTEXTS][SINGLE_REFS - 1][2];
Merge bi-predictive frames to EXT_REFS This patch removed the experiment of BIDIR_PRED and merged the feature into the experiment of EXT_REFS: (1) Each frame now has up to 6 reference frames, namely LAST_FRAME, LAST2_FRAME, LAST3_FRAME, GOLDEN_FRAME, (forward) and BWDREF_FRAME, ALTREF_FRAME (backward); LAST4_FRAME has been removed; (2) First pass still keeps the 8 updates: KF_UPDATE, LF_UPDATE, GF_UPDATE, ARF_UPDATE, OVERLAY_UPDATE, and BRF_UPDATE, LAST_BIPRED_UPDATE, BI_PRED_UPDATE; (3) show_existing_frame==1 is supported in the experiment of EXT_REFS; (4) New encoding modes are added for both single-ref and compound cases, through the use of the 2 extra forward references (LAST2 & LAST3) and the 1 extra backward reference (BWDREF). RD performance wise, using Overall PSNR: Avg/BDRate Bipred only Prev EXT_REFS Current EXT_REFS with bipred lowres: -3.474/-3.324 -1.748/-1.586 -4.613/-4.387 derflr: -2.097/-1.353 -1.439/-1.215 -3.120/-2.252 midres: -2.129/-1.901 -1.345/-1.185 -2.898/-2.636 If in vp10/encoder/firstpass.h, change BFG_INTERVAL from 2 to 3, i.e. to use 2 bi-predictive frames than 1, a further improvement may be obtained: Current EXT_REFS with bipred 1 bi-predictive frame 2 bi-predictive frames lowres: -4.613/-4.387 -4.675/-4.465 derflr: -3.120/-2.252 -3.333/-2.516 midres: -2.898/-2.636 -3.406/-3.095 Change-Id: Ib06fe9ea0a5cfd7418a1d79b978ee9d80bf191cb
2016-06-09 00:27:56 +03:00
#if CONFIG_EXT_REFS
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
unsigned int comp_ref[REF_CONTEXTS][FWD_REFS - 1][2];
unsigned int comp_bwdref[REF_CONTEXTS][BWD_REFS - 1][2];
Added an experiment "bidir_pred" for backward prediction Major parts have been implemented as follows: (1) Added BRF_UPDATE, LASTNRF_UPDATE, and NRF_UPDATE in firstpass.c; (2) Added the handling for the scenario of "cpi->common.show_existing_frame == 1" at the encoder; (3) Added a new reference frame of BWDREF_FRAME; (4) Have bwd-ref work with upsampled references. Note that when the experiment of "ext_refs" turned on, this experiment will be turned off automatically currently. RD performance in Overall PSNR has been improved, compared against the VP10 baseline: lowres: Avg -3.312; BDRate -3.154 derflr: Avg -1.927; BDRate -1.176 midres: Avg -2.149; BDRate -2.001 hdres : Avg -0.567; BDRate -0.588 Change-Id: I4c06ff51cc20194bffbd4d2346e57ba3dcf6b62c
2016-02-04 20:47:46 +03:00
#else
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
unsigned int comp_ref[REF_CONTEXTS][COMP_REFS - 1][2];
Merge bi-predictive frames to EXT_REFS This patch removed the experiment of BIDIR_PRED and merged the feature into the experiment of EXT_REFS: (1) Each frame now has up to 6 reference frames, namely LAST_FRAME, LAST2_FRAME, LAST3_FRAME, GOLDEN_FRAME, (forward) and BWDREF_FRAME, ALTREF_FRAME (backward); LAST4_FRAME has been removed; (2) First pass still keeps the 8 updates: KF_UPDATE, LF_UPDATE, GF_UPDATE, ARF_UPDATE, OVERLAY_UPDATE, and BRF_UPDATE, LAST_BIPRED_UPDATE, BI_PRED_UPDATE; (3) show_existing_frame==1 is supported in the experiment of EXT_REFS; (4) New encoding modes are added for both single-ref and compound cases, through the use of the 2 extra forward references (LAST2 & LAST3) and the 1 extra backward reference (BWDREF). RD performance wise, using Overall PSNR: Avg/BDRate Bipred only Prev EXT_REFS Current EXT_REFS with bipred lowres: -3.474/-3.324 -1.748/-1.586 -4.613/-4.387 derflr: -2.097/-1.353 -1.439/-1.215 -3.120/-2.252 midres: -2.129/-1.901 -1.345/-1.185 -2.898/-2.636 If in vp10/encoder/firstpass.h, change BFG_INTERVAL from 2 to 3, i.e. to use 2 bi-predictive frames than 1, a further improvement may be obtained: Current EXT_REFS with bipred 1 bi-predictive frame 2 bi-predictive frames lowres: -4.613/-4.387 -4.675/-4.465 derflr: -3.120/-2.252 -3.333/-2.516 midres: -2.898/-2.636 -3.406/-3.095 Change-Id: Ib06fe9ea0a5cfd7418a1d79b978ee9d80bf191cb
2016-06-09 00:27:56 +03:00
#endif // CONFIG_EXT_REFS
Use rectangular transforms for >= 8x8 blocks For rectangular blocks between 8x8 and 32x32, we can now code the transform size as one bigger than the largest square that fits in the block (eg, for 16x8, we can code a transform size of 16x16 rather than the previous maximum of 8x8), when this oversized transform is coded in the bitstream, the codec will use the full size rectangular transform for that block (eg 16x8 transform in the above example). Also fixes a scaling bug in 16x8/8x16 transforms. Change-Id: I62ce75f1b01c46fe2fbc727ce4abef695f4fcd43
2016-07-26 19:12:43 +03:00
// TODO(any): tx_size_totals is only used by the encoder to decide whether
// to use forward updates for the coeff probs, and as such it does not really
// belong into this structure.
Refactor entropy coding of transform size No performance change. Change-Id: If35125fed909d89235b303514f77a33183bb36b3
2016-03-08 02:25:50 +03:00
unsigned int tx_size_totals[TX_SIZES];
unsigned int tx_size[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES];
Enable entropy coding of recursive transform block partition This commit enables the entropy coding of the recursive transform block partition syntax. Change-Id: I0c2509fb7b9822d12a721f9ebf9327fac83c777e
2015-10-14 19:38:17 +03:00
#if CONFIG_VAR_TX
unsigned int txfm_partition[TXFM_PARTITION_CONTEXTS][2];
#endif
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
unsigned int skip[SKIP_CONTEXTS][2];
Vectorize motion vector probability models This commit converts the scalar motion vector probability model into vector format for later precise estimate. Change-Id: I7008d047ecc1b9577aa8442b4db2df312be869dc
2016-02-18 22:57:44 +03:00
#if CONFIG_REF_MV
nmv_context_counts mv[NMV_CONTEXTS];
#else
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
nmv_context_counts mv;
Vectorize motion vector probability models This commit converts the scalar motion vector probability model into vector format for later precise estimate. Change-Id: I7008d047ecc1b9577aa8442b4db2df312be869dc
2016-02-18 22:57:44 +03:00
#endif
Backport EXT_TX experiment from nextgen Does not include DST1 yet. derflr: +1.437 (8-bit internal), +7.243 (12-bit internal) with --enable-ext-tx Change-Id: I91f1759fd2de794755eb6384cda52e80e979cb7d
2015-09-03 12:58:12 +03:00
#if CONFIG_EXT_TX
Missing fixes for rect-tx Reintroducing some fixes that were dropped inadvertently in course of rebasing. Change-Id: I5f51160c586010590d4bfd5cf225fb21347b0a40
2016-08-23 10:17:00 +03:00
#if CONFIG_RECT_TX
unsigned int tx_size_implied[TX_SIZES][TX_SIZES];
#endif // CONFIG_RECT_TX
Refactoring tx-types to add more flexibility Allows inter and intra tx_types to have different sets of transforms for different tx_size/sb_type combinations. Change-Id: Ic0ac1daef7a9fb15c4210271e4d04cd36e5cec8e
2015-10-12 22:30:55 +03:00
unsigned int inter_ext_tx[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES];
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
unsigned int
intra_ext_tx[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][TX_TYPES];
Merge branch 'master' into nextgenv2 Manually resovled the following conflicts: vp10/common/blockd.h vp10/common/entropy.h vp10/common/entropymode.c vp10/common/entropymode.h vp10/common/enums.h vp10/common/thread_common.c vp10/decoder/decodeframe.c vp10/decoder/decodemv.c vp10/encoder/bitstream.c vp10/encoder/encodeframe.c vp10/encoder/rd.c vp10/encoder/rdopt.c Change-Id: I15d20ce5292b70f0c2b4ba55c1f1318181481596
2016-01-11 21:27:35 +03:00
#else
Modifies inter/intra coding to allow all tx types The nominal tx_type for a given mode is used as a context to encode the actual tx_type for intra. Results: derflr: -0.241% BDRATE hevcmr: -0.366% BDRATE Change-Id: Icfe7b0a58d79bc6497a06e3441779afec6e01e21
2016-01-06 22:24:57 +03:00
unsigned int intra_ext_tx[EXT_TX_SIZES][TX_TYPES][TX_TYPES];
unsigned int inter_ext_tx[EXT_TX_SIZES][TX_TYPES];
Backport EXT_TX experiment from nextgen Does not include DST1 yet. derflr: +1.437 (8-bit internal), +7.243 (12-bit internal) with --enable-ext-tx Change-Id: I91f1759fd2de794755eb6384cda52e80e979cb7d
2015-09-03 12:58:12 +03:00
#endif // CONFIG_EXT_TX
Super transform - ported from nextgen branch Various additional changes were made to make the experiment compatible with misc_fixes. derflr: +0.979% hevcmr: +0.865% Speed-wise with --enable-supertx the encoder is only about 10% slower than without. Decoding impact is about 30% slowdown. Note this does not work with ext-tx or var-tx yet. That is a TODO. Change-Id: If25af4241a7a9efbd28f58eda3c4f044c7a7ef4b
2015-11-20 03:51:16 +03:00
#if CONFIG_SUPERTX
unsigned int supertx[PARTITION_SUPERTX_CONTEXTS][TX_SIZES][2];
unsigned int supertx_size[TX_SIZES];
#endif // CONFIG_SUPERTX
vp10: make segmentation probs use generic probability model. Locate them (code-wise) in frame_context, and have them be updated as any other probability using the subexp forward and adaptive bw updates. See issue 1040 point 1. TODOs: - real-world default probabilities - why is counts sometimes NULL in the decoder? Does that mean bw adaptivity updates only work on some frames? (I haven't looked very closely yet, maybe this is a red herring.) Change-Id: I23b57b4e5e7574b75f16eb64823b29c22fbab42e
2015-10-13 21:06:28 +03:00
struct seg_counts seg;
ext-intra experiment Currently there are two parts in this experiment: extra directional intra prediction modes and the filter intra modes migrated from the nextgen branch. Several macros are defined in "blockd.h" to provide controls of the experiment settings. Setting "DR_ONLY" as 1 (default is 0) means we only use directional modes, and skip the filter-intra modes; "EXT_INTRA_ANGLES" (default is 128) defines the number of different angles we want to support; setting "ANGLE_FAST_SEARCH" as 1 (default is 1) means we use fast sub-optimal search for the best prediction angle, instead of exhaustive search. The fast search is about 6 times faster than the exhaustive search, while preserving about 60% of the coding gains. With extra directional prediction modes (fast search), we observe the following code gains (number in parentheses is for all-key-frame setting): derflr +0.42% (+1.79%) hevclr +0.78% (+2.19%) hevcmr +1.20% (+3.49%) stdhd +0.56% Speed-wise, about 110% slower for key frames, and 30% slower overall. The gains of filter intra modes mostly add up with the gains of directional modes. The overall coding gain of this experiment: derflr +0.94% hevclr +1.46% hevcmr +1.94% stdhd +1.58% Change-Id: Ida9ad00cdb33aff422d06eb42b4f4e5f25df8a2a
2015-10-07 19:29:02 +03:00
#if CONFIG_EXT_INTRA
unsigned int ext_intra[PLANE_TYPES][2];
Add 8-tap interpolation filter options for intra prediction BD-rate performance improvement (on top of ext-intra): derflr 0.22% hevclr 0.36% hevcmr 0.48% hevchr 0.37% stdhd 0.19% Average speed impact on some derf clips is about 40% slower (on top of ext-intra). Speed improvment is a to-do. Change-Id: I8fe3fe8c5e4f60d0462778adbcc15c84dfbe7a25
2016-01-13 03:38:58 +03:00
unsigned int intra_filter[INTRA_FILTERS + 1][INTRA_FILTERS];
ext-intra experiment Currently there are two parts in this experiment: extra directional intra prediction modes and the filter intra modes migrated from the nextgen branch. Several macros are defined in "blockd.h" to provide controls of the experiment settings. Setting "DR_ONLY" as 1 (default is 0) means we only use directional modes, and skip the filter-intra modes; "EXT_INTRA_ANGLES" (default is 128) defines the number of different angles we want to support; setting "ANGLE_FAST_SEARCH" as 1 (default is 1) means we use fast sub-optimal search for the best prediction angle, instead of exhaustive search. The fast search is about 6 times faster than the exhaustive search, while preserving about 60% of the coding gains. With extra directional prediction modes (fast search), we observe the following code gains (number in parentheses is for all-key-frame setting): derflr +0.42% (+1.79%) hevclr +0.78% (+2.19%) hevcmr +1.20% (+3.49%) stdhd +0.56% Speed-wise, about 110% slower for key frames, and 30% slower overall. The gains of filter intra modes mostly add up with the gains of directional modes. The overall coding gain of this experiment: derflr +0.94% hevclr +1.46% hevcmr +1.94% stdhd +1.58% Change-Id: Ida9ad00cdb33aff422d06eb42b4f4e5f25df8a2a
2015-10-07 19:29:02 +03:00
#endif // CONFIG_EXT_INTRA
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
} FRAME_COUNTS;
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_prob
av1_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1];
extern const aom_prob av1_default_palette_y_mode_prob[PALETTE_BLOCK_SIZES]
[PALETTE_Y_MODE_CONTEXTS];
extern const aom_prob av1_default_palette_uv_mode_prob[2];
extern const aom_prob
av1_default_palette_y_size_prob[PALETTE_BLOCK_SIZES][PALETTE_SIZES - 1];
extern const aom_prob
av1_default_palette_uv_size_prob[PALETTE_BLOCK_SIZES][PALETTE_SIZES - 1];
extern const aom_prob av1_default_palette_y_color_prob
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
[PALETTE_MAX_SIZE - 1][PALETTE_COLOR_CONTEXTS][PALETTE_COLORS - 1];
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_prob av1_default_palette_uv_color_prob
vp10/common: apply clang-format Change-Id: I01d8241eba3ccaf4d06c00a51df2d17c126f6f9d
2016-08-12 04:55:00 +03:00
[PALETTE_MAX_SIZE - 1][PALETTE_COLOR_CONTEXTS][PALETTE_COLORS - 1];
VP10: Add palette mode part 1 Add palette mode for keyframe luma channel. Palette mode is enabled when using "--tune-content=screen" in encoding config parameters. on screen_content testset: +6.89% on derlr : +0.00% Design doc (WIP): https://goo.gl/lD4yJw Change-Id: Ib368b216bfd3ea21c6c27436934ad87afdaa6f88
2015-09-15 22:44:13 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index av1_intra_mode_tree[TREE_SIZE(INTRA_MODES)];
extern const aom_tree_index av1_inter_mode_tree[TREE_SIZE(INTER_MODES)];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#if CONFIG_EXT_INTER
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index
av1_interintra_mode_tree[TREE_SIZE(INTERINTRA_MODES)];
extern const aom_tree_index
av1_inter_compound_mode_tree[TREE_SIZE(INTER_COMPOUND_MODES)];
Adding new compound modes to EXT_INTER experiment Combinations of different mv modes for two reference frames are allowed in compound inter modes. 9 options are enabled, including NEAREST_NEARESTMV, NEAREST_NEARMV, NEAR_NEARESTMV, NEAREST_NEWMV, NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, ZERO_ZEROMV, and NEW_NEWMV. This experiment is mostly deported from the nextgen branch. It is made compatible with other experiments Coding gain of EXT_INTER(derflr/hevcmr/hevchd): 0.533%/0.728%/0.639% Change-Id: Id47e97284e6481b186870afbad33204b7a33dbb0
2016-01-20 03:45:45 +03:00
#endif // CONFIG_EXT_INTER
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index av1_partition_tree[TREE_SIZE(PARTITION_TYPES)];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#if CONFIG_EXT_PARTITION_TYPES
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index
av1_ext_partition_tree[TREE_SIZE(EXT_PARTITION_TYPES)];
Porting ext_partition experiment from nextgen This has been ported under ext_partition_types because it is due to be combined with the coding_unit_size experiment which is already being ported under ext_partition Change-Id: I47af869ae123ddf0aa99160dac644059d14266ee
2016-03-17 19:50:28 +03:00
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index
av1_switchable_interp_tree[TREE_SIZE(SWITCHABLE_FILTERS)];
extern const aom_tree_index av1_palette_size_tree[TREE_SIZE(PALETTE_SIZES)];
extern const aom_tree_index
av1_palette_color_tree[PALETTE_MAX_SIZE - 1][TREE_SIZE(PALETTE_COLORS)];
extern const aom_tree_index av1_tx_size_tree[TX_SIZES - 1][TREE_SIZE(TX_SIZES)];
Add 8-tap interpolation filter options for intra prediction BD-rate performance improvement (on top of ext-intra): derflr 0.22% hevclr 0.36% hevcmr 0.48% hevchr 0.37% stdhd 0.19% Average speed impact on some derf clips is about 40% slower (on top of ext-intra). Speed improvment is a to-do. Change-Id: I8fe3fe8c5e4f60d0462778adbcc15c84dfbe7a25
2016-01-13 03:38:58 +03:00
#if CONFIG_EXT_INTRA
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index av1_intra_filter_tree[TREE_SIZE(INTRA_FILTERS)];
Add 8-tap interpolation filter options for intra prediction BD-rate performance improvement (on top of ext-intra): derflr 0.22% hevclr 0.36% hevcmr 0.48% hevchr 0.37% stdhd 0.19% Average speed impact on some derf clips is about 40% slower (on top of ext-intra). Speed improvment is a to-do. Change-Id: I8fe3fe8c5e4f60d0462778adbcc15c84dfbe7a25
2016-01-13 03:38:58 +03:00
#endif // CONFIG_EXT_INTRA
#if CONFIG_EXT_TX
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index
av1_ext_tx_inter_tree[EXT_TX_SETS_INTER][TREE_SIZE(TX_TYPES)];
extern const aom_tree_index
av1_ext_tx_intra_tree[EXT_TX_SETS_INTRA][TREE_SIZE(TX_TYPES)];
Add 8-tap interpolation filter options for intra prediction BD-rate performance improvement (on top of ext-intra): derflr 0.22% hevclr 0.36% hevcmr 0.48% hevchr 0.37% stdhd 0.19% Average speed impact on some derf clips is about 40% slower (on top of ext-intra). Speed improvment is a to-do. Change-Id: I8fe3fe8c5e4f60d0462778adbcc15c84dfbe7a25
2016-01-13 03:38:58 +03:00
#else
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index av1_ext_tx_tree[TREE_SIZE(TX_TYPES)];
Add 8-tap interpolation filter options for intra prediction BD-rate performance improvement (on top of ext-intra): derflr 0.22% hevclr 0.36% hevcmr 0.48% hevchr 0.37% stdhd 0.19% Average speed impact on some derf clips is about 40% slower (on top of ext-intra). Speed improvment is a to-do. Change-Id: I8fe3fe8c5e4f60d0462778adbcc15c84dfbe7a25
2016-01-13 03:38:58 +03:00
#endif // CONFIG_EXT_TX
Some refactoring to support warped motion mode Change-Id: I15d54a3ae48b2b33082668116792c6595bdb3ddb
2016-06-09 10:57:09 +03:00
#if CONFIG_OBMC || CONFIG_WARPED_MOTION
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
extern const aom_tree_index av1_motvar_tree[TREE_SIZE(MOTION_VARIATIONS)];
Some refactoring to support warped motion mode Change-Id: I15d54a3ae48b2b33082668116792c6595bdb3ddb
2016-06-09 10:57:09 +03:00
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
void av1_setup_past_independence(struct AV1Common *cm);
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
void av1_adapt_intra_frame_probs(struct AV1Common *cm);
void av1_adapt_inter_frame_probs(struct AV1Common *cm);
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
static INLINE int av1_ceil_log2(int n) {
VP10: Add palette mode part 1 Add palette mode for keyframe luma channel. Palette mode is enabled when using "--tune-content=screen" in encoding config parameters. on screen_content testset: +6.89% on derlr : +0.00% Design doc (WIP): https://goo.gl/lD4yJw Change-Id: Ib368b216bfd3ea21c6c27436934ad87afdaa6f88
2015-09-15 22:44:13 +03:00
int i = 1, p = 2;
while (p < n) {
i++;
p = p << 1;
}
return i;
}
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
int av1_get_palette_color_context(const uint8_t *color_map, int cols, int r,
int c, int n, int *color_order);
Bring palette back to nextgenv2 It was removed by the master branch merge. Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
2015-12-08 05:18:57 +03:00
Fork VP9 and VP10 codebase This commit folks the VP9 and VP10 codebase and makes libvpx support VP8, VP9, and VP10. Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
2015-08-06 05:00:31 +03:00
#ifdef __cplusplus
} // extern "C"
#endif
Port renaming changes from AOMedia Cherry-Picked the following commits: 0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia" 54e6676 Replace "VPx" by "AVx" 5082a36 Change "Vpx" to "Avx" 7df44f1 Replace "Vp9" w/ "Av1" 967f722 Remove kVp9CodecId 828f30c Change "Vp8" to "AOM" 030b5ff AUTHORS regenerated 2524cae Add ref-mv experimental flag 016762b Change copyright notice to AOMedia form 81e5526 Replace vp9 w/ av1 9b94565 Add missing files fa8ca9f Change "vp9" to "av1" ec838b7 Convert "vp8" to "aom" 80edfa0 Change "VP9" to "AV1" d1a11fb Change "vp8" to "aom" 7b58251 Point to WebM test data dd1a5c8 Replace "VP8" with "AOM" ff00fc0 Change "VPX" to "AOM" 01dee0b Change "vp10" to "av1" in source code cebe6f0 Convert "vpx" to "aom" 17b0567 rename vp10*.mk to av1_*.mk fe5f8a8 rename files vp10_* to av1_* Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
2016-08-31 00:01:10 +03:00
#endif // AV1_COMMON_ENTROPYMODE_H_