Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
aom-rav1e
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiph.Org
aom-rav1e
Commits
9f9cc8fe
Commit
9f9cc8fe
authored
12 years ago
by
John Koleszar
Committed by
Gerrit Code Review
12 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Add VPX_TS_ prefix to MAX_LAYERS, MAX_PERIODICITY" into eider
parents
d8216b19
d46ddd08
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
vp8/common/onyx.h
+3
-3
3 additions, 3 deletions
vp8/common/onyx.h
vp8/encoder/onyx_int.h
+15
-17
15 additions, 17 deletions
vp8/encoder/onyx_int.h
vp8_scalable_patterns.c
+3
-3
3 additions, 3 deletions
vp8_scalable_patterns.c
vpx/vpx_encoder.h
+11
-5
11 additions, 5 deletions
vpx/vpx_encoder.h
with
32 additions
and
28 deletions
vp8/common/onyx.h
+
3
−
3
View file @
9f9cc8fe
...
...
@@ -207,10 +207,10 @@ extern "C"
// Temporal scaling parameters
unsigned
int
number_of_layers
;
unsigned
int
target_bitrate
[
MAX_PERIODICITY
];
unsigned
int
rate_decimator
[
MAX_PERIODICITY
];
unsigned
int
target_bitrate
[
VPX_TS_
MAX_PERIODICITY
];
unsigned
int
rate_decimator
[
VPX_TS_
MAX_PERIODICITY
];
unsigned
int
periodicity
;
unsigned
int
layer_id
[
MAX_PERIODICITY
];
unsigned
int
layer_id
[
VPX_TS_
MAX_PERIODICITY
];
#if CONFIG_MULTI_RES_ENCODING
/* Number of total resolutions encoded */
...
...
This diff is collapsed.
Click to expand it.
vp8/encoder/onyx_int.h
+
15
−
17
View file @
9f9cc8fe
...
...
@@ -57,8 +57,6 @@
#define VP8_TEMPORAL_ALT_REF 1
#endif
#define MAX_PERIODICITY 16
#define MAX(x,y) (((x)>(y))?(x):(y))
#define MIN(x,y) (((x)<(y))?(x):(y))
...
...
@@ -670,21 +668,21 @@ typedef struct VP8_COMP
// Coding layer state variables
unsigned
int
current_layer
;
LAYER_CONTEXT
layer_context
[
MAX_LAYERS
];
int64_t
frames_in_layer
[
MAX_LAYERS
];
int64_t
bytes_in_layer
[
MAX_LAYERS
];
double
sum_psnr
[
MAX_LAYERS
];
double
sum_psnr_p
[
MAX_LAYERS
];
double
total_error2
[
MAX_LAYERS
];
double
total_error2_p
[
MAX_LAYERS
];
double
sum_ssim
[
MAX_LAYERS
];
double
sum_weights
[
MAX_LAYERS
];
double
total_ssimg_y_in_layer
[
MAX_LAYERS
];
double
total_ssimg_u_in_layer
[
MAX_LAYERS
];
double
total_ssimg_v_in_layer
[
MAX_LAYERS
];
double
total_ssimg_all_in_layer
[
MAX_LAYERS
];
LAYER_CONTEXT
layer_context
[
VPX_TS_
MAX_LAYERS
];
int64_t
frames_in_layer
[
VPX_TS_
MAX_LAYERS
];
int64_t
bytes_in_layer
[
VPX_TS_
MAX_LAYERS
];
double
sum_psnr
[
VPX_TS_
MAX_LAYERS
];
double
sum_psnr_p
[
VPX_TS_
MAX_LAYERS
];
double
total_error2
[
VPX_TS_
MAX_LAYERS
];
double
total_error2_p
[
VPX_TS_
MAX_LAYERS
];
double
sum_ssim
[
VPX_TS_
MAX_LAYERS
];
double
sum_weights
[
VPX_TS_
MAX_LAYERS
];
double
total_ssimg_y_in_layer
[
VPX_TS_
MAX_LAYERS
];
double
total_ssimg_u_in_layer
[
VPX_TS_
MAX_LAYERS
];
double
total_ssimg_v_in_layer
[
VPX_TS_
MAX_LAYERS
];
double
total_ssimg_all_in_layer
[
VPX_TS_
MAX_LAYERS
];
#if CONFIG_MULTI_RES_ENCODING
/* Number of MBs per row at lower-resolution level */
...
...
This diff is collapsed.
Click to expand it.
vp8_scalable_patterns.c
+
3
−
3
View file @
9f9cc8fe
...
...
@@ -117,7 +117,7 @@ static void write_ivf_frame_header(FILE *outfile,
static
int
mode_to_num_layers
[
9
]
=
{
2
,
2
,
3
,
3
,
3
,
3
,
5
,
2
,
3
};
int
main
(
int
argc
,
char
**
argv
)
{
FILE
*
infile
,
*
outfile
[
MAX_LAYERS
];
FILE
*
infile
,
*
outfile
[
VPX_TS_
MAX_LAYERS
];
vpx_codec_ctx_t
codec
;
vpx_codec_enc_cfg_t
cfg
;
int
frame_cnt
=
0
;
...
...
@@ -133,8 +133,8 @@ int main(int argc, char **argv) {
int
frame_duration
=
1
;
// 1 timebase tick per frame
int
layering_mode
=
0
;
int
frames_in_layer
[
MAX_LAYERS
]
=
{
0
};
int
layer_flags
[
MAX_PERIODICITY
]
=
{
0
};
int
frames_in_layer
[
VPX_TS_
MAX_LAYERS
]
=
{
0
};
int
layer_flags
[
VPX_TS_
MAX_PERIODICITY
]
=
{
0
};
int
flag_periodicity
;
int
max_intra_size_pct
;
...
...
This diff is collapsed.
Click to expand it.
vpx/vpx_encoder.h
+
11
−
5
View file @
9f9cc8fe
...
...
@@ -35,10 +35,16 @@ extern "C" {
/*! Temporal Scalability: Maximum length of the sequence defining frame
* layer membership
*/
#define MAX_PERIODICITY 16
#define
VPX_TS_
MAX_PERIODICITY 16
/*! Temporal Scalability: Maximum number of coding layers */
#define MAX_LAYERS 5
#define VPX_TS_MAX_LAYERS 5
/*!\deprecated Use #VPX_TS_MAX_PERIODICITY instead. */
#define MAX_PERIODICITY VPX_TS_MAX_PERIODICITY
/*!\deprecated Use #VPX_TS_MAX_LAYERS instead. */
#define MAX_LAYERS VPX_TS_MAX_LAYERS
/*!\brief Current ABI version number
*
...
...
@@ -613,14 +619,14 @@ extern "C" {
*
* These values specify the target coding bitrate for each coding layer.
*/
unsigned
int
ts_target_bitrate
[
MAX_LAYERS
];
unsigned
int
ts_target_bitrate
[
VPX_TS_
MAX_LAYERS
];
/*!\brief Frame rate decimation factor for each layer
*
* These values specify the frame rate decimation factors to apply
* to each layer.
*/
unsigned
int
ts_rate_decimator
[
MAX_LAYERS
];
unsigned
int
ts_rate_decimator
[
VPX_TS_
MAX_LAYERS
];
/*!\brief Length of the sequence defining frame layer membership
*
...
...
@@ -638,7 +644,7 @@ extern "C" {
* and odd numbered frames to a second layer (1) with ts_periodicity=8,
* then ts_layer_id = (0,1,0,1,0,1,0,1).
*/
unsigned
int
ts_layer_id
[
MAX_PERIODICITY
];
unsigned
int
ts_layer_id
[
VPX_TS_
MAX_PERIODICITY
];
}
vpx_codec_enc_cfg_t
;
/**< alias for struct vpx_codec_enc_cfg */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment