Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f1cf4058
Commit
f1cf4058
authored
Jan 15, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jan 15, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Removing pass number check from ivf_write_file_header()."
parents
9adcc4d6
096ab110
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
ivfenc.c
ivfenc.c
+0
-3
vpxenc.c
vpxenc.c
+14
-5
No files found.
ivfenc.c
View file @
f1cf4058
...
...
@@ -20,9 +20,6 @@ void ivf_write_file_header(FILE *outfile,
int
frame_cnt
)
{
char
header
[
32
];
if
(
cfg
->
g_pass
!=
VPX_RC_ONE_PASS
&&
cfg
->
g_pass
!=
VPX_RC_LAST_PASS
)
return
;
header
[
0
]
=
'D'
;
header
[
1
]
=
'K'
;
header
[
2
]
=
'I'
;
...
...
vpxenc.c
View file @
f1cf4058
...
...
@@ -1393,6 +1393,10 @@ static void show_stream_config(struct stream_state *stream,
static
void
open_output_file
(
struct
stream_state
*
stream
,
struct
VpxEncoderConfig
*
global
)
{
const
char
*
fn
=
stream
->
config
.
out_fn
;
const
struct
vpx_codec_enc_cfg
*
const
cfg
=
&
stream
->
config
.
cfg
;
if
(
cfg
->
g_pass
==
VPX_RC_FIRST_PASS
)
return
;
stream
->
file
=
strcmp
(
fn
,
"-"
)
?
fopen
(
fn
,
"wb"
)
:
set_binary_mode
(
stdout
);
...
...
@@ -1404,18 +1408,23 @@ static void open_output_file(struct stream_state *stream,
if
(
stream
->
config
.
write_webm
)
{
stream
->
ebml
.
stream
=
stream
->
file
;
write_webm_file_header
(
&
stream
->
ebml
,
&
stream
->
config
.
cfg
,
write_webm_file_header
(
&
stream
->
ebml
,
cfg
,
&
global
->
framerate
,
stream
->
config
.
stereo_fmt
,
global
->
codec
->
fourcc
);
}
else
ivf_write_file_header
(
stream
->
file
,
&
stream
->
config
.
cfg
,
global
->
codec
->
fourcc
,
0
);
}
else
{
ivf_write_file_header
(
stream
->
file
,
cfg
,
global
->
codec
->
fourcc
,
0
);
}
}
static
void
close_output_file
(
struct
stream_state
*
stream
,
unsigned
int
fourcc
)
{
unsigned
int
fourcc
)
{
const
struct
vpx_codec_enc_cfg
*
const
cfg
=
&
stream
->
config
.
cfg
;
if
(
cfg
->
g_pass
==
VPX_RC_FIRST_PASS
)
return
;
if
(
stream
->
config
.
write_webm
)
{
write_webm_file_footer
(
&
stream
->
ebml
,
stream
->
hash
);
free
(
stream
->
ebml
.
cue_list
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment