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
c0061cc2
Commit
c0061cc2
authored
Jul 07, 2014
by
Marco Paniconi
Committed by
Gerrit Code Review
Jul 07, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix build for examples/vp8_multi_resolution_encoder."
parents
fe4b6635
5f732c20
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
22 deletions
+5
-22
examples.mk
examples.mk
+2
-1
examples/vp8_multi_resolution_encoder.c
examples/vp8_multi_resolution_encoder.c
+3
-21
No files found.
examples.mk
View file @
c0061cc2
...
...
@@ -179,7 +179,8 @@ vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame
ifeq
($(CONFIG_MULTI_RES_ENCODING),yes)
ifeq
($(CONFIG_LIBYUV),yes)
EXAMPLES-$(CONFIG_VP8_DECODER)
+=
vp8_multi_resolution_encoder.c
EXAMPLES-$(CONFIG_VP8_ENCODER)
+=
vp8_multi_resolution_encoder.c
vp8_multi_resolution_encoder.SRCS
+=
tools_common.h tools_common.c
vp8_multi_resolution_encoder.SRCS
+=
$(LIBYUV_SRCS)
vp8_multi_resolution_encoder.GUID
=
04f8738e-63c8-423b-90fa-7c2703a374de
vp8_multi_resolution_encoder.DESCRIPTION
=
VP8 Multiple-resolution Encoding
...
...
examples/vp8_multi_resolution_encoder.c
View file @
c0061cc2
...
...
@@ -27,8 +27,9 @@
#define interface (vpx_codec_vp8_cx())
#define fourcc 0x30385056
#define IVF_FILE_HDR_SZ (32)
#define IVF_FRAME_HDR_SZ (12)
void
usage_exit
()
{
exit
(
EXIT_FAILURE
);
}
/*
* The input video frame is downsampled several times to generate a multi-level
...
...
@@ -45,25 +46,6 @@
#include "third_party/libyuv/include/libyuv/scale.h"
#include "third_party/libyuv/include/libyuv/cpu_id.h"
static
void
die
(
const
char
*
fmt
,
...)
{
va_list
ap
;
va_start
(
ap
,
fmt
);
vprintf
(
fmt
,
ap
);
if
(
fmt
[
strlen
(
fmt
)
-
1
]
!=
'\n'
)
printf
(
"
\n
"
);
exit
(
EXIT_FAILURE
);
}
static
void
die_codec
(
vpx_codec_ctx_t
*
ctx
,
const
char
*
s
)
{
const
char
*
detail
=
vpx_codec_error_detail
(
ctx
);
printf
(
"%s: %s
\n
"
,
s
,
vpx_codec_error
(
ctx
));
if
(
detail
)
printf
(
" %s
\n
"
,
detail
);
exit
(
EXIT_FAILURE
);
}
int
(
*
read_frame_p
)(
FILE
*
f
,
vpx_image_t
*
img
);
static
int
read_frame
(
FILE
*
f
,
vpx_image_t
*
img
)
{
...
...
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