examples: apply clang-format
Change-Id: Icc3bbb07c99a31a70030baec7e51b881902a7b5e
This commit is contained in:
parent
c69cc4ce1f
commit
ef45540927
@ -65,8 +65,7 @@ static void get_image_md5(const vpx_image_t *img, unsigned char digest[16]) {
|
|||||||
static void print_md5(FILE *stream, unsigned char digest[16]) {
|
static void print_md5(FILE *stream, unsigned char digest[16]) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < 16; ++i)
|
for (i = 0; i < 16; ++i) fprintf(stream, "%02x", digest[i]);
|
||||||
fprintf(stream, "%02x", digest[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *exec_name;
|
static const char *exec_name;
|
||||||
@ -86,12 +85,10 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 3)
|
if (argc != 3) die("Invalid number of arguments.");
|
||||||
die("Invalid number of arguments.");
|
|
||||||
|
|
||||||
reader = vpx_video_reader_open(argv[1]);
|
reader = vpx_video_reader_open(argv[1]);
|
||||||
if (!reader)
|
if (!reader) die("Failed to open %s for reading.", argv[1]);
|
||||||
die("Failed to open %s for reading.", argv[1]);
|
|
||||||
|
|
||||||
if (!(outfile = fopen(argv[2], "wb")))
|
if (!(outfile = fopen(argv[2], "wb")))
|
||||||
die("Failed to open %s for writing.", argv[2]);
|
die("Failed to open %s for writing.", argv[2]);
|
||||||
@ -99,8 +96,7 @@ int main(int argc, char **argv) {
|
|||||||
info = vpx_video_reader_get_info(reader);
|
info = vpx_video_reader_get_info(reader);
|
||||||
|
|
||||||
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
||||||
if (!decoder)
|
if (!decoder) die("Unknown input codec.");
|
||||||
die("Unknown input codec.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
||||||
|
|
||||||
@ -111,8 +107,8 @@ int main(int argc, char **argv) {
|
|||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
vpx_image_t *img = NULL;
|
vpx_image_t *img = NULL;
|
||||||
size_t frame_size = 0;
|
size_t frame_size = 0;
|
||||||
const unsigned char *frame = vpx_video_reader_get_frame(reader,
|
const unsigned char *frame =
|
||||||
&frame_size);
|
vpx_video_reader_get_frame(reader, &frame_size);
|
||||||
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
||||||
die_codec(&codec, "Failed to decode frame");
|
die_codec(&codec, "Failed to decode frame");
|
||||||
|
|
||||||
@ -121,14 +117,13 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
get_image_md5(img, digest);
|
get_image_md5(img, digest);
|
||||||
print_md5(outfile, digest);
|
print_md5(outfile, digest);
|
||||||
fprintf(outfile, " img-%dx%d-%04d.i420\n",
|
fprintf(outfile, " img-%dx%d-%04d.i420\n", img->d_w, img->d_h,
|
||||||
img->d_w, img->d_h, ++frame_cnt);
|
++frame_cnt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Processed %d frames.\n", frame_cnt);
|
printf("Processed %d frames.\n", frame_cnt);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_reader_close(reader);
|
vpx_video_reader_close(reader);
|
||||||
|
|
||||||
|
@ -84,12 +84,10 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 4)
|
if (argc != 4) die("Invalid number of arguments.");
|
||||||
die("Invalid number of arguments.");
|
|
||||||
|
|
||||||
reader = vpx_video_reader_open(argv[1]);
|
reader = vpx_video_reader_open(argv[1]);
|
||||||
if (!reader)
|
if (!reader) die("Failed to open %s for reading.", argv[1]);
|
||||||
die("Failed to open %s for reading.", argv[1]);
|
|
||||||
|
|
||||||
if (!(outfile = fopen(argv[2], "wb")))
|
if (!(outfile = fopen(argv[2], "wb")))
|
||||||
die("Failed to open %s for writing.", argv[2]);
|
die("Failed to open %s for writing.", argv[2]);
|
||||||
@ -103,8 +101,7 @@ int main(int argc, char **argv) {
|
|||||||
info = vpx_video_reader_get_info(reader);
|
info = vpx_video_reader_get_info(reader);
|
||||||
|
|
||||||
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
||||||
if (!decoder)
|
if (!decoder) die("Unknown input codec.");
|
||||||
die("Unknown input codec.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
||||||
|
|
||||||
@ -116,8 +113,8 @@ int main(int argc, char **argv) {
|
|||||||
vpx_image_t *img = NULL;
|
vpx_image_t *img = NULL;
|
||||||
size_t frame_size = 0;
|
size_t frame_size = 0;
|
||||||
int skip;
|
int skip;
|
||||||
const unsigned char *frame = vpx_video_reader_get_frame(reader,
|
const unsigned char *frame =
|
||||||
&frame_size);
|
vpx_video_reader_get_frame(reader, &frame_size);
|
||||||
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
||||||
die_codec(&codec, "Failed to decode frame.");
|
die_codec(&codec, "Failed to decode frame.");
|
||||||
|
|
||||||
@ -139,8 +136,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf("Processed %d frames.\n", frame_cnt);
|
printf("Processed %d frames.\n", frame_cnt);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
||||||
info->frame_width, info->frame_height, argv[2]);
|
info->frame_width, info->frame_height, argv[2]);
|
||||||
|
@ -68,12 +68,10 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 3)
|
if (argc != 3) die("Invalid number of arguments.");
|
||||||
die("Invalid number of arguments.");
|
|
||||||
|
|
||||||
reader = vpx_video_reader_open(argv[1]);
|
reader = vpx_video_reader_open(argv[1]);
|
||||||
if (!reader)
|
if (!reader) die("Failed to open %s for reading.", argv[1]);
|
||||||
die("Failed to open %s for reading.", argv[1]);
|
|
||||||
|
|
||||||
if (!(outfile = fopen(argv[2], "wb")))
|
if (!(outfile = fopen(argv[2], "wb")))
|
||||||
die("Failed to open %s for writing", argv[2]);
|
die("Failed to open %s for writing", argv[2]);
|
||||||
@ -81,8 +79,7 @@ int main(int argc, char **argv) {
|
|||||||
info = vpx_video_reader_get_info(reader);
|
info = vpx_video_reader_get_info(reader);
|
||||||
|
|
||||||
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
||||||
if (!decoder)
|
if (!decoder) die("Unknown input codec.");
|
||||||
die("Unknown input codec.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
||||||
|
|
||||||
@ -91,15 +88,14 @@ int main(int argc, char **argv) {
|
|||||||
if (res == VPX_CODEC_INCAPABLE)
|
if (res == VPX_CODEC_INCAPABLE)
|
||||||
die_codec(&codec, "Postproc not supported by this decoder.");
|
die_codec(&codec, "Postproc not supported by this decoder.");
|
||||||
|
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to initialize decoder.");
|
||||||
die_codec(&codec, "Failed to initialize decoder.");
|
|
||||||
|
|
||||||
while (vpx_video_reader_read_frame(reader)) {
|
while (vpx_video_reader_read_frame(reader)) {
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
vpx_image_t *img = NULL;
|
vpx_image_t *img = NULL;
|
||||||
size_t frame_size = 0;
|
size_t frame_size = 0;
|
||||||
const unsigned char *frame = vpx_video_reader_get_frame(reader,
|
const unsigned char *frame =
|
||||||
&frame_size);
|
vpx_video_reader_get_frame(reader, &frame_size);
|
||||||
|
|
||||||
++frame_cnt;
|
++frame_cnt;
|
||||||
|
|
||||||
@ -109,8 +105,8 @@ int main(int argc, char **argv) {
|
|||||||
if (vpx_codec_control(&codec, VP8_SET_POSTPROC, &pp))
|
if (vpx_codec_control(&codec, VP8_SET_POSTPROC, &pp))
|
||||||
die_codec(&codec, "Failed to turn off postproc.");
|
die_codec(&codec, "Failed to turn off postproc.");
|
||||||
} else if (frame_cnt % 30 == 16) {
|
} else if (frame_cnt % 30 == 16) {
|
||||||
vp8_postproc_cfg_t pp = {VP8_DEBLOCK | VP8_DEMACROBLOCK | VP8_MFQE,
|
vp8_postproc_cfg_t pp = { VP8_DEBLOCK | VP8_DEMACROBLOCK | VP8_MFQE, 4,
|
||||||
4, 0};
|
0 };
|
||||||
if (vpx_codec_control(&codec, VP8_SET_POSTPROC, &pp))
|
if (vpx_codec_control(&codec, VP8_SET_POSTPROC, &pp))
|
||||||
die_codec(&codec, "Failed to turn on postproc.");
|
die_codec(&codec, "Failed to turn on postproc.");
|
||||||
};
|
};
|
||||||
@ -125,8 +121,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf("Processed %d frames.\n", frame_cnt);
|
printf("Processed %d frames.\n", frame_cnt);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec");
|
||||||
die_codec(&codec, "Failed to destroy codec");
|
|
||||||
|
|
||||||
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
||||||
info->frame_width, info->frame_height, argv[2]);
|
info->frame_width, info->frame_height, argv[2]);
|
||||||
|
@ -34,10 +34,8 @@ void usage_exit(void) {
|
|||||||
|
|
||||||
static int parse_dim(char *v, int *width, int *height) {
|
static int parse_dim(char *v, int *width, int *height) {
|
||||||
char *x = strchr(v, 'x');
|
char *x = strchr(v, 'x');
|
||||||
if (x == NULL)
|
if (x == NULL) x = strchr(v, 'X');
|
||||||
x = strchr(v, 'X');
|
if (x == NULL) return 0;
|
||||||
if (x == NULL)
|
|
||||||
return 0;
|
|
||||||
*width = atoi(v);
|
*width = atoi(v);
|
||||||
*height = atoi(&x[1]);
|
*height = atoi(&x[1]);
|
||||||
if (*width <= 0 || *height <= 0)
|
if (*width <= 0 || *height <= 0)
|
||||||
@ -93,10 +91,8 @@ int main(int argc, char *argv[]) {
|
|||||||
else
|
else
|
||||||
frames = INT_MAX;
|
frames = INT_MAX;
|
||||||
|
|
||||||
printf("Input size: %dx%d\n",
|
printf("Input size: %dx%d\n", width, height);
|
||||||
width, height);
|
printf("Target size: %dx%d, Frames: ", target_width, target_height);
|
||||||
printf("Target size: %dx%d, Frames: ",
|
|
||||||
target_width, target_height);
|
|
||||||
if (frames == INT_MAX)
|
if (frames == INT_MAX)
|
||||||
printf("All\n");
|
printf("All\n");
|
||||||
else
|
else
|
||||||
@ -110,13 +106,10 @@ int main(int argc, char *argv[]) {
|
|||||||
outbuf_v = outbuf_u + target_width * target_height / 4;
|
outbuf_v = outbuf_u + target_width * target_height / 4;
|
||||||
f = 0;
|
f = 0;
|
||||||
while (f < frames) {
|
while (f < frames) {
|
||||||
if (fread(inbuf, width * height * 3 / 2, 1, fpin) != 1)
|
if (fread(inbuf, width * height * 3 / 2, 1, fpin) != 1) break;
|
||||||
break;
|
vp9_resize_frame420(inbuf, width, inbuf_u, inbuf_v, width / 2, height,
|
||||||
vp9_resize_frame420(inbuf, width, inbuf_u, inbuf_v, width / 2,
|
width, outbuf, target_width, outbuf_u, outbuf_v,
|
||||||
height, width,
|
target_width / 2, target_height, target_width);
|
||||||
outbuf, target_width, outbuf_u, outbuf_v,
|
|
||||||
target_width / 2,
|
|
||||||
target_height, target_width);
|
|
||||||
fwrite(outbuf, target_width * target_height * 3 / 2, 1, fpout);
|
fwrite(outbuf, target_width * target_height * 3 / 2, 1, fpout);
|
||||||
f++;
|
f++;
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// VP8 Set Active and ROI Maps
|
// VP8 Set Active and ROI Maps
|
||||||
// ===========================
|
// ===========================
|
||||||
//
|
//
|
||||||
@ -86,8 +85,7 @@ static void set_roi_map(const vpx_codec_enc_cfg_t *cfg,
|
|||||||
roi.static_threshold[3] = 0;
|
roi.static_threshold[3] = 0;
|
||||||
|
|
||||||
roi.roi_map = (uint8_t *)malloc(roi.rows * roi.cols);
|
roi.roi_map = (uint8_t *)malloc(roi.rows * roi.cols);
|
||||||
for (i = 0; i < roi.rows * roi.cols; ++i)
|
for (i = 0; i < roi.rows * roi.cols; ++i) roi.roi_map[i] = i % 4;
|
||||||
roi.roi_map[i] = i % 4;
|
|
||||||
|
|
||||||
if (vpx_codec_control(codec, VP8E_SET_ROI_MAP, &roi))
|
if (vpx_codec_control(codec, VP8E_SET_ROI_MAP, &roi))
|
||||||
die_codec(codec, "Failed to set ROI map");
|
die_codec(codec, "Failed to set ROI map");
|
||||||
@ -104,8 +102,7 @@ static void set_active_map(const vpx_codec_enc_cfg_t *cfg,
|
|||||||
map.cols = (cfg->g_w + 15) / 16;
|
map.cols = (cfg->g_w + 15) / 16;
|
||||||
|
|
||||||
map.active_map = (uint8_t *)malloc(map.rows * map.cols);
|
map.active_map = (uint8_t *)malloc(map.rows * map.cols);
|
||||||
for (i = 0; i < map.rows * map.cols; ++i)
|
for (i = 0; i < map.rows * map.cols; ++i) map.active_map[i] = i % 2;
|
||||||
map.active_map[i] = i % 2;
|
|
||||||
|
|
||||||
if (vpx_codec_control(codec, VP8E_SET_ACTIVEMAP, &map))
|
if (vpx_codec_control(codec, VP8E_SET_ACTIVEMAP, &map))
|
||||||
die_codec(codec, "Failed to set active map");
|
die_codec(codec, "Failed to set active map");
|
||||||
@ -125,25 +122,21 @@ static void unset_active_map(const vpx_codec_enc_cfg_t *cfg,
|
|||||||
die_codec(codec, "Failed to set active map");
|
die_codec(codec, "Failed to set active map");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *codec,
|
static int encode_frame(vpx_codec_ctx_t *codec, vpx_image_t *img,
|
||||||
vpx_image_t *img,
|
int frame_index, VpxVideoWriter *writer) {
|
||||||
int frame_index,
|
|
||||||
VpxVideoWriter *writer) {
|
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1, 0,
|
const vpx_codec_err_t res =
|
||||||
VPX_DL_GOOD_QUALITY);
|
vpx_codec_encode(codec, img, frame_index, 1, 0, VPX_DL_GOOD_QUALITY);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(codec, "Failed to encode frame");
|
||||||
die_codec(codec, "Failed to encode frame");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
|
|
||||||
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
||||||
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
||||||
if (!vpx_video_writer_write_frame(writer,
|
if (!vpx_video_writer_write_frame(writer, pkt->data.frame.buf,
|
||||||
pkt->data.frame.buf,
|
|
||||||
pkt->data.frame.sz,
|
pkt->data.frame.sz,
|
||||||
pkt->data.frame.pts)) {
|
pkt->data.frame.pts)) {
|
||||||
die_codec(codec, "Failed to write compressed frame");
|
die_codec(codec, "Failed to write compressed frame");
|
||||||
@ -171,8 +164,7 @@ int main(int argc, char **argv) {
|
|||||||
const double bits_per_pixel_per_frame = 0.067;
|
const double bits_per_pixel_per_frame = 0.067;
|
||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
if (argc != 6)
|
if (argc != 6) die("Invalid number of arguments");
|
||||||
die("Invalid number of arguments");
|
|
||||||
|
|
||||||
memset(&info, 0, sizeof(info));
|
memset(&info, 0, sizeof(info));
|
||||||
|
|
||||||
@ -187,10 +179,8 @@ int main(int argc, char **argv) {
|
|||||||
info.time_base.numerator = 1;
|
info.time_base.numerator = 1;
|
||||||
info.time_base.denominator = fps;
|
info.time_base.denominator = fps;
|
||||||
|
|
||||||
if (info.frame_width <= 0 ||
|
if (info.frame_width <= 0 || info.frame_height <= 0 ||
|
||||||
info.frame_height <= 0 ||
|
(info.frame_width % 2) != 0 || (info.frame_height % 2) != 0) {
|
||||||
(info.frame_width % 2) != 0 ||
|
|
||||||
(info.frame_height % 2) != 0) {
|
|
||||||
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -202,20 +192,18 @@ int main(int argc, char **argv) {
|
|||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to get default codec config.");
|
||||||
die_codec(&codec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = info.frame_width;
|
cfg.g_w = info.frame_width;
|
||||||
cfg.g_h = info.frame_height;
|
cfg.g_h = info.frame_height;
|
||||||
cfg.g_timebase.num = info.time_base.numerator;
|
cfg.g_timebase.num = info.time_base.numerator;
|
||||||
cfg.g_timebase.den = info.time_base.denominator;
|
cfg.g_timebase.den = info.time_base.denominator;
|
||||||
cfg.rc_target_bitrate = (unsigned int)(bits_per_pixel_per_frame * cfg.g_w *
|
cfg.rc_target_bitrate =
|
||||||
cfg.g_h * fps / 1000);
|
(unsigned int)(bits_per_pixel_per_frame * cfg.g_w * cfg.g_h * fps / 1000);
|
||||||
cfg.g_lag_in_frames = 0;
|
cfg.g_lag_in_frames = 0;
|
||||||
|
|
||||||
writer = vpx_video_writer_open(argv[5], kContainerIVF, &info);
|
writer = vpx_video_writer_open(argv[5], kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing.", argv[5]);
|
||||||
die("Failed to open %s for writing.", argv[5]);
|
|
||||||
|
|
||||||
if (!(infile = fopen(argv[4], "rb")))
|
if (!(infile = fopen(argv[4], "rb")))
|
||||||
die("Failed to open %s for reading.", argv[4]);
|
die("Failed to open %s for reading.", argv[4]);
|
||||||
@ -239,15 +227,15 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (encode_frame(&codec, NULL, -1, writer)) {}
|
while (encode_frame(&codec, NULL, -1, writer)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
printf("Processed %d frames.\n", frame_count);
|
printf("Processed %d frames.\n", frame_count);
|
||||||
|
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// Simple Decoder
|
// Simple Decoder
|
||||||
// ==============
|
// ==============
|
||||||
//
|
//
|
||||||
@ -103,12 +102,10 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 3)
|
if (argc != 3) die("Invalid number of arguments.");
|
||||||
die("Invalid number of arguments.");
|
|
||||||
|
|
||||||
reader = vpx_video_reader_open(argv[1]);
|
reader = vpx_video_reader_open(argv[1]);
|
||||||
if (!reader)
|
if (!reader) die("Failed to open %s for reading.", argv[1]);
|
||||||
die("Failed to open %s for reading.", argv[1]);
|
|
||||||
|
|
||||||
if (!(outfile = fopen(argv[2], "wb")))
|
if (!(outfile = fopen(argv[2], "wb")))
|
||||||
die("Failed to open %s for writing.", argv[2]);
|
die("Failed to open %s for writing.", argv[2]);
|
||||||
@ -116,8 +113,7 @@ int main(int argc, char **argv) {
|
|||||||
info = vpx_video_reader_get_info(reader);
|
info = vpx_video_reader_get_info(reader);
|
||||||
|
|
||||||
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
decoder = get_vpx_decoder_by_fourcc(info->codec_fourcc);
|
||||||
if (!decoder)
|
if (!decoder) die("Unknown input codec.");
|
||||||
die("Unknown input codec.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface()));
|
||||||
|
|
||||||
@ -128,8 +124,8 @@ int main(int argc, char **argv) {
|
|||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
vpx_image_t *img = NULL;
|
vpx_image_t *img = NULL;
|
||||||
size_t frame_size = 0;
|
size_t frame_size = 0;
|
||||||
const unsigned char *frame = vpx_video_reader_get_frame(reader,
|
const unsigned char *frame =
|
||||||
&frame_size);
|
vpx_video_reader_get_frame(reader, &frame_size);
|
||||||
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
if (vpx_codec_decode(&codec, frame, (unsigned int)frame_size, NULL, 0))
|
||||||
die_codec(&codec, "Failed to decode frame.");
|
die_codec(&codec, "Failed to decode frame.");
|
||||||
|
|
||||||
@ -140,8 +136,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf("Processed %d frames.\n", frame_cnt);
|
printf("Processed %d frames.\n", frame_cnt);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec");
|
||||||
die_codec(&codec, "Failed to destroy codec");
|
|
||||||
|
|
||||||
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
printf("Play: ffplay -f rawvideo -pix_fmt yuv420p -s %dx%d %s\n",
|
||||||
info->frame_width, info->frame_height, argv[2]);
|
info->frame_width, info->frame_height, argv[2]);
|
||||||
|
@ -115,26 +115,21 @@ void usage_exit(void) {
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *codec,
|
static int encode_frame(vpx_codec_ctx_t *codec, vpx_image_t *img,
|
||||||
vpx_image_t *img,
|
int frame_index, int flags, VpxVideoWriter *writer) {
|
||||||
int frame_index,
|
|
||||||
int flags,
|
|
||||||
VpxVideoWriter *writer) {
|
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1,
|
const vpx_codec_err_t res =
|
||||||
flags, VPX_DL_GOOD_QUALITY);
|
vpx_codec_encode(codec, img, frame_index, 1, flags, VPX_DL_GOOD_QUALITY);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(codec, "Failed to encode frame");
|
||||||
die_codec(codec, "Failed to encode frame");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
|
|
||||||
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
||||||
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
||||||
if (!vpx_video_writer_write_frame(writer,
|
if (!vpx_video_writer_write_frame(writer, pkt->data.frame.buf,
|
||||||
pkt->data.frame.buf,
|
|
||||||
pkt->data.frame.sz,
|
pkt->data.frame.sz,
|
||||||
pkt->data.frame.pts)) {
|
pkt->data.frame.pts)) {
|
||||||
die_codec(codec, "Failed to write compressed frame");
|
die_codec(codec, "Failed to write compressed frame");
|
||||||
@ -172,8 +167,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 9)
|
if (argc != 9) die("Invalid number of arguments");
|
||||||
die("Invalid number of arguments");
|
|
||||||
|
|
||||||
codec_arg = argv[1];
|
codec_arg = argv[1];
|
||||||
width_arg = argv[2];
|
width_arg = argv[2];
|
||||||
@ -184,8 +178,7 @@ int main(int argc, char **argv) {
|
|||||||
max_frames = strtol(argv[8], NULL, 0);
|
max_frames = strtol(argv[8], NULL, 0);
|
||||||
|
|
||||||
encoder = get_vpx_encoder_by_name(codec_arg);
|
encoder = get_vpx_encoder_by_name(codec_arg);
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
info.codec_fourcc = encoder->fourcc;
|
info.codec_fourcc = encoder->fourcc;
|
||||||
info.frame_width = strtol(width_arg, NULL, 0);
|
info.frame_width = strtol(width_arg, NULL, 0);
|
||||||
@ -193,10 +186,8 @@ int main(int argc, char **argv) {
|
|||||||
info.time_base.numerator = 1;
|
info.time_base.numerator = 1;
|
||||||
info.time_base.denominator = fps;
|
info.time_base.denominator = fps;
|
||||||
|
|
||||||
if (info.frame_width <= 0 ||
|
if (info.frame_width <= 0 || info.frame_height <= 0 ||
|
||||||
info.frame_height <= 0 ||
|
(info.frame_width % 2) != 0 || (info.frame_height % 2) != 0) {
|
||||||
(info.frame_width % 2) != 0 ||
|
|
||||||
(info.frame_height % 2) != 0) {
|
|
||||||
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -206,14 +197,12 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
keyframe_interval = strtol(keyframe_interval_arg, NULL, 0);
|
keyframe_interval = strtol(keyframe_interval_arg, NULL, 0);
|
||||||
if (keyframe_interval < 0)
|
if (keyframe_interval < 0) die("Invalid keyframe interval value.");
|
||||||
die("Invalid keyframe interval value.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to get default codec config.");
|
||||||
die_codec(&codec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = info.frame_width;
|
cfg.g_w = info.frame_width;
|
||||||
cfg.g_h = info.frame_height;
|
cfg.g_h = info.frame_height;
|
||||||
@ -223,8 +212,7 @@ int main(int argc, char **argv) {
|
|||||||
cfg.g_error_resilient = strtol(argv[7], NULL, 0);
|
cfg.g_error_resilient = strtol(argv[7], NULL, 0);
|
||||||
|
|
||||||
writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info);
|
writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing.", outfile_arg);
|
||||||
die("Failed to open %s for writing.", outfile_arg);
|
|
||||||
|
|
||||||
if (!(infile = fopen(infile_arg, "rb")))
|
if (!(infile = fopen(infile_arg, "rb")))
|
||||||
die("Failed to open %s for reading.", infile_arg);
|
die("Failed to open %s for reading.", infile_arg);
|
||||||
@ -239,20 +227,19 @@ int main(int argc, char **argv) {
|
|||||||
flags |= VPX_EFLAG_FORCE_KF;
|
flags |= VPX_EFLAG_FORCE_KF;
|
||||||
encode_frame(&codec, &raw, frame_count++, flags, writer);
|
encode_frame(&codec, &raw, frame_count++, flags, writer);
|
||||||
frames_encoded++;
|
frames_encoded++;
|
||||||
if (max_frames > 0 && frames_encoded >= max_frames)
|
if (max_frames > 0 && frames_encoded >= max_frames) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (encode_frame(&codec, NULL, -1, 0, writer)) {};
|
while (encode_frame(&codec, NULL, -1, 0, writer)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
printf("Processed %d frames.\n", frame_count);
|
printf("Processed %d frames.\n", frame_count);
|
||||||
|
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
|
|
||||||
|
@ -66,20 +66,16 @@ void usage_exit(void) {
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_frame_stats(vpx_codec_ctx_t *ctx,
|
static int get_frame_stats(vpx_codec_ctx_t *ctx, const vpx_image_t *img,
|
||||||
const vpx_image_t *img,
|
vpx_codec_pts_t pts, unsigned int duration,
|
||||||
vpx_codec_pts_t pts,
|
vpx_enc_frame_flags_t flags, unsigned int deadline,
|
||||||
unsigned int duration,
|
|
||||||
vpx_enc_frame_flags_t flags,
|
|
||||||
unsigned int deadline,
|
|
||||||
vpx_fixed_buf_t *stats) {
|
vpx_fixed_buf_t *stats) {
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags,
|
const vpx_codec_err_t res =
|
||||||
deadline);
|
vpx_codec_encode(ctx, img, pts, duration, flags, deadline);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(ctx, "Failed to get frame stats.");
|
||||||
die_codec(ctx, "Failed to get frame stats.");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
@ -96,20 +92,16 @@ static int get_frame_stats(vpx_codec_ctx_t *ctx,
|
|||||||
return got_pkts;
|
return got_pkts;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *ctx,
|
static int encode_frame(vpx_codec_ctx_t *ctx, const vpx_image_t *img,
|
||||||
const vpx_image_t *img,
|
vpx_codec_pts_t pts, unsigned int duration,
|
||||||
vpx_codec_pts_t pts,
|
vpx_enc_frame_flags_t flags, unsigned int deadline,
|
||||||
unsigned int duration,
|
|
||||||
vpx_enc_frame_flags_t flags,
|
|
||||||
unsigned int deadline,
|
|
||||||
VpxVideoWriter *writer) {
|
VpxVideoWriter *writer) {
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags,
|
const vpx_codec_err_t res =
|
||||||
deadline);
|
vpx_codec_encode(ctx, img, pts, duration, flags, deadline);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(ctx, "Failed to encode frame.");
|
||||||
die_codec(ctx, "Failed to encode frame.");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
@ -128,11 +120,9 @@ static int encode_frame(vpx_codec_ctx_t *ctx,
|
|||||||
return got_pkts;
|
return got_pkts;
|
||||||
}
|
}
|
||||||
|
|
||||||
static vpx_fixed_buf_t pass0(vpx_image_t *raw,
|
static vpx_fixed_buf_t pass0(vpx_image_t *raw, FILE *infile,
|
||||||
FILE *infile,
|
|
||||||
const VpxInterface *encoder,
|
const VpxInterface *encoder,
|
||||||
const vpx_codec_enc_cfg_t *cfg,
|
const vpx_codec_enc_cfg_t *cfg, int max_frames) {
|
||||||
int max_frames) {
|
|
||||||
vpx_codec_ctx_t codec;
|
vpx_codec_ctx_t codec;
|
||||||
int frame_count = 0;
|
int frame_count = 0;
|
||||||
vpx_fixed_buf_t stats = { NULL, 0 };
|
vpx_fixed_buf_t stats = { NULL, 0 };
|
||||||
@ -145,40 +135,33 @@ static vpx_fixed_buf_t pass0(vpx_image_t *raw,
|
|||||||
++frame_count;
|
++frame_count;
|
||||||
get_frame_stats(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY,
|
get_frame_stats(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY,
|
||||||
&stats);
|
&stats);
|
||||||
if (max_frames > 0 && frame_count >= max_frames)
|
if (max_frames > 0 && frame_count >= max_frames) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (get_frame_stats(&codec, NULL, frame_count, 1, 0,
|
while (get_frame_stats(&codec, NULL, frame_count, 1, 0, VPX_DL_GOOD_QUALITY,
|
||||||
VPX_DL_GOOD_QUALITY, &stats)) {}
|
&stats)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("Pass 0 complete. Processed %d frames.\n", frame_count);
|
printf("Pass 0 complete. Processed %d frames.\n", frame_count);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
return stats;
|
return stats;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pass1(vpx_image_t *raw,
|
static void pass1(vpx_image_t *raw, FILE *infile, const char *outfile_name,
|
||||||
FILE *infile,
|
const VpxInterface *encoder, const vpx_codec_enc_cfg_t *cfg,
|
||||||
const char *outfile_name,
|
|
||||||
const VpxInterface *encoder,
|
|
||||||
const vpx_codec_enc_cfg_t *cfg,
|
|
||||||
int max_frames) {
|
int max_frames) {
|
||||||
VpxVideoInfo info = {
|
VpxVideoInfo info = { encoder->fourcc,
|
||||||
encoder->fourcc,
|
|
||||||
cfg->g_w,
|
cfg->g_w,
|
||||||
cfg->g_h,
|
cfg->g_h,
|
||||||
{cfg->g_timebase.num, cfg->g_timebase.den}
|
{ cfg->g_timebase.num, cfg->g_timebase.den } };
|
||||||
};
|
|
||||||
VpxVideoWriter *writer = NULL;
|
VpxVideoWriter *writer = NULL;
|
||||||
vpx_codec_ctx_t codec;
|
vpx_codec_ctx_t codec;
|
||||||
int frame_count = 0;
|
int frame_count = 0;
|
||||||
|
|
||||||
writer = vpx_video_writer_open(outfile_name, kContainerIVF, &info);
|
writer = vpx_video_writer_open(outfile_name, kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing", outfile_name);
|
||||||
die("Failed to open %s for writing", outfile_name);
|
|
||||||
|
|
||||||
if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0))
|
if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0))
|
||||||
die_codec(&codec, "Failed to initialize encoder");
|
die_codec(&codec, "Failed to initialize encoder");
|
||||||
@ -188,17 +171,16 @@ static void pass1(vpx_image_t *raw,
|
|||||||
++frame_count;
|
++frame_count;
|
||||||
encode_frame(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY, writer);
|
encode_frame(&codec, raw, frame_count, 1, 0, VPX_DL_GOOD_QUALITY, writer);
|
||||||
|
|
||||||
if (max_frames > 0 && frame_count >= max_frames)
|
if (max_frames > 0 && frame_count >= max_frames) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (encode_frame(&codec, NULL, -1, 1, 0, VPX_DL_GOOD_QUALITY, writer)) {}
|
while (encode_frame(&codec, NULL, -1, 1, 0, VPX_DL_GOOD_QUALITY, writer)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
|
|
||||||
@ -225,14 +207,12 @@ int main(int argc, char **argv) {
|
|||||||
int max_frames = 0;
|
int max_frames = 0;
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 7)
|
if (argc != 7) die("Invalid number of arguments.");
|
||||||
die("Invalid number of arguments.");
|
|
||||||
|
|
||||||
max_frames = strtol(argv[6], NULL, 0);
|
max_frames = strtol(argv[6], NULL, 0);
|
||||||
|
|
||||||
encoder = get_vpx_encoder_by_name(codec_arg);
|
encoder = get_vpx_encoder_by_name(codec_arg);
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
w = strtol(width_arg, NULL, 0);
|
w = strtol(width_arg, NULL, 0);
|
||||||
h = strtol(height_arg, NULL, 0);
|
h = strtol(height_arg, NULL, 0);
|
||||||
@ -247,8 +227,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
// Configuration
|
// Configuration
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to get default codec config.");
|
||||||
die_codec(&codec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = w;
|
cfg.g_w = w;
|
||||||
cfg.g_h = h;
|
cfg.g_h = h;
|
||||||
|
@ -37,9 +37,7 @@
|
|||||||
#define interface (vpx_codec_vp8_cx())
|
#define interface (vpx_codec_vp8_cx())
|
||||||
#define fourcc 0x30385056
|
#define fourcc 0x30385056
|
||||||
|
|
||||||
void usage_exit(void) {
|
void usage_exit(void) { exit(EXIT_FAILURE); }
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The input video frame is downsampled several times to generate a multi-level
|
* The input video frame is downsampled several times to generate a multi-level
|
||||||
@ -82,8 +80,7 @@ static int read_frame_by_row(FILE *f, vpx_image_t *img) {
|
|||||||
int res = 1;
|
int res = 1;
|
||||||
int plane;
|
int plane;
|
||||||
|
|
||||||
for (plane = 0; plane < 3; plane++)
|
for (plane = 0; plane < 3; plane++) {
|
||||||
{
|
|
||||||
unsigned char *ptr;
|
unsigned char *ptr;
|
||||||
int w = (plane ? (1 + img->d_w) / 2 : img->d_w);
|
int w = (plane ? (1 + img->d_w) / 2 : img->d_w);
|
||||||
int h = (plane ? (1 + img->d_h) / 2 : img->d_h);
|
int h = (plane ? (1 + img->d_h) / 2 : img->d_h);
|
||||||
@ -93,20 +90,19 @@ static int read_frame_by_row(FILE *f, vpx_image_t *img) {
|
|||||||
* always counts in Y,U,V order, but this may not match the order of
|
* always counts in Y,U,V order, but this may not match the order of
|
||||||
* the data on disk.
|
* the data on disk.
|
||||||
*/
|
*/
|
||||||
switch (plane)
|
switch (plane) {
|
||||||
{
|
|
||||||
case 1:
|
case 1:
|
||||||
ptr = img->planes[img->fmt==VPX_IMG_FMT_YV12? VPX_PLANE_V : VPX_PLANE_U];
|
ptr = img->planes[img->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_V
|
||||||
|
: VPX_PLANE_U];
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
ptr = img->planes[img->fmt==VPX_IMG_FMT_YV12?VPX_PLANE_U : VPX_PLANE_V];
|
ptr = img->planes[img->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_U
|
||||||
|
: VPX_PLANE_V];
|
||||||
break;
|
break;
|
||||||
default:
|
default: ptr = img->planes[plane];
|
||||||
ptr = img->planes[plane];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (r = 0; r < h; r++)
|
for (r = 0; r < h; r++) {
|
||||||
{
|
|
||||||
to_read = w;
|
to_read = w;
|
||||||
|
|
||||||
nbytes = fread(ptr, 1, to_read, f);
|
nbytes = fread(ptr, 1, to_read, f);
|
||||||
@ -119,20 +115,17 @@ static int read_frame_by_row(FILE *f, vpx_image_t *img) {
|
|||||||
|
|
||||||
ptr += img->stride[plane];
|
ptr += img->stride[plane];
|
||||||
}
|
}
|
||||||
if (!res)
|
if (!res) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void write_ivf_file_header(FILE *outfile,
|
static void write_ivf_file_header(FILE *outfile, const vpx_codec_enc_cfg_t *cfg,
|
||||||
const vpx_codec_enc_cfg_t *cfg,
|
|
||||||
int frame_cnt) {
|
int frame_cnt) {
|
||||||
char header[32];
|
char header[32];
|
||||||
|
|
||||||
if(cfg->g_pass != VPX_RC_ONE_PASS && cfg->g_pass != VPX_RC_LAST_PASS)
|
if (cfg->g_pass != VPX_RC_ONE_PASS && cfg->g_pass != VPX_RC_LAST_PASS) return;
|
||||||
return;
|
|
||||||
header[0] = 'D';
|
header[0] = 'D';
|
||||||
header[1] = 'K';
|
header[1] = 'K';
|
||||||
header[2] = 'I';
|
header[2] = 'I';
|
||||||
@ -151,13 +144,11 @@ static void write_ivf_file_header(FILE *outfile,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void write_ivf_frame_header(FILE *outfile,
|
static void write_ivf_frame_header(FILE *outfile,
|
||||||
const vpx_codec_cx_pkt_t *pkt)
|
const vpx_codec_cx_pkt_t *pkt) {
|
||||||
{
|
|
||||||
char header[12];
|
char header[12];
|
||||||
vpx_codec_pts_t pts;
|
vpx_codec_pts_t pts;
|
||||||
|
|
||||||
if(pkt->kind != VPX_CODEC_CX_FRAME_PKT)
|
if (pkt->kind != VPX_CODEC_CX_FRAME_PKT) return;
|
||||||
return;
|
|
||||||
|
|
||||||
pts = pkt->data.frame.pts;
|
pts = pkt->data.frame.pts;
|
||||||
mem_put_le32(header, pkt->data.frame.sz);
|
mem_put_le32(header, pkt->data.frame.sz);
|
||||||
@ -173,15 +164,11 @@ static void write_ivf_frame_header(FILE *outfile,
|
|||||||
* parameters will be passed in as user parameters in another version.
|
* parameters will be passed in as user parameters in another version.
|
||||||
*/
|
*/
|
||||||
static void set_temporal_layer_pattern(int num_temporal_layers,
|
static void set_temporal_layer_pattern(int num_temporal_layers,
|
||||||
vpx_codec_enc_cfg_t *cfg,
|
vpx_codec_enc_cfg_t *cfg, int bitrate,
|
||||||
int bitrate,
|
int *layer_flags) {
|
||||||
int *layer_flags)
|
|
||||||
{
|
|
||||||
assert(num_temporal_layers <= MAX_NUM_TEMPORAL_LAYERS);
|
assert(num_temporal_layers <= MAX_NUM_TEMPORAL_LAYERS);
|
||||||
switch (num_temporal_layers)
|
switch (num_temporal_layers) {
|
||||||
{
|
case 1: {
|
||||||
case 1:
|
|
||||||
{
|
|
||||||
/* 1-layer */
|
/* 1-layer */
|
||||||
cfg->ts_number_layers = 1;
|
cfg->ts_number_layers = 1;
|
||||||
cfg->ts_periodicity = 1;
|
cfg->ts_periodicity = 1;
|
||||||
@ -194,8 +181,7 @@ static void set_temporal_layer_pattern(int num_temporal_layers,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 2:
|
case 2: {
|
||||||
{
|
|
||||||
/* 2-layers, with sync point at first frame of layer 1. */
|
/* 2-layers, with sync point at first frame of layer 1. */
|
||||||
cfg->ts_number_layers = 2;
|
cfg->ts_number_layers = 2;
|
||||||
cfg->ts_periodicity = 2;
|
cfg->ts_periodicity = 2;
|
||||||
@ -212,22 +198,18 @@ static void set_temporal_layer_pattern(int num_temporal_layers,
|
|||||||
// key frame. Sync point every 8 frames.
|
// key frame. Sync point every 8 frames.
|
||||||
|
|
||||||
// Layer 0: predict from L and ARF, update L and G.
|
// Layer 0: predict from L and ARF, update L and G.
|
||||||
layer_flags[0] = VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
|
|
||||||
// Layer 1: sync point: predict from L and ARF, and update G.
|
// Layer 1: sync point: predict from L and ARF, and update G.
|
||||||
layer_flags[1] = VP8_EFLAG_NO_REF_GF |
|
layer_flags[1] =
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
|
|
||||||
// Layer 0, predict from L and ARF, update L.
|
// Layer 0, predict from L and ARF, update L.
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF |
|
layer_flags[2] =
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
|
|
||||||
// Layer 1: predict from L, G and ARF, and update G.
|
// Layer 1: predict from L, G and ARF, and update G.
|
||||||
layer_flags[3] = VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[3] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
|
|
||||||
// Layer 0
|
// Layer 0
|
||||||
@ -245,8 +227,7 @@ static void set_temporal_layer_pattern(int num_temporal_layers,
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
default:
|
default: {
|
||||||
{
|
|
||||||
// 3-layers structure where ARF is used as predictor for all frames,
|
// 3-layers structure where ARF is used as predictor for all frames,
|
||||||
// and is only updated on key frame.
|
// and is only updated on key frame.
|
||||||
// Sync points for layer 1 and 2 every 8 frames.
|
// Sync points for layer 1 and 2 every 8 frames.
|
||||||
@ -267,38 +248,30 @@ static void set_temporal_layer_pattern(int num_temporal_layers,
|
|||||||
/* 0=L, 1=GF, 2=ARF */
|
/* 0=L, 1=GF, 2=ARF */
|
||||||
|
|
||||||
// Layer 0: predict from L and ARF; update L and G.
|
// Layer 0: predict from L and ARF; update L and G.
|
||||||
layer_flags[0] = VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[0] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF;
|
||||||
VP8_EFLAG_NO_REF_GF;
|
|
||||||
|
|
||||||
// Layer 2: sync point: predict from L and ARF; update none.
|
// Layer 2: sync point: predict from L and ARF; update none.
|
||||||
layer_flags[1] = VP8_EFLAG_NO_REF_GF |
|
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_ARF |
|
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
|
|
||||||
// Layer 1: sync point: predict from L and ARF; update G.
|
// Layer 1: sync point: predict from L and ARF; update G.
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF |
|
layer_flags[2] =
|
||||||
VP8_EFLAG_NO_UPD_ARF |
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
VP8_EFLAG_NO_UPD_LAST;
|
|
||||||
|
|
||||||
// Layer 2: predict from L, G, ARF; update none.
|
// Layer 2: predict from L, G, ARF; update none.
|
||||||
layer_flags[3] = VP8_EFLAG_NO_UPD_GF |
|
layer_flags[3] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF |
|
||||||
VP8_EFLAG_NO_UPD_ARF |
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_ENTROPY;
|
|
||||||
|
|
||||||
// Layer 0: predict from L and ARF; update L.
|
// Layer 0: predict from L and ARF; update L.
|
||||||
layer_flags[4] = VP8_EFLAG_NO_UPD_GF |
|
layer_flags[4] =
|
||||||
VP8_EFLAG_NO_UPD_ARF |
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF;
|
||||||
VP8_EFLAG_NO_REF_GF;
|
|
||||||
|
|
||||||
// Layer 2: predict from L, G, ARF; update none.
|
// Layer 2: predict from L, G, ARF; update none.
|
||||||
layer_flags[5] = layer_flags[3];
|
layer_flags[5] = layer_flags[3];
|
||||||
|
|
||||||
// Layer 1: predict from L, G, ARF; update G.
|
// Layer 1: predict from L, G, ARF; update G.
|
||||||
layer_flags[6] = VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[6] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
VP8_EFLAG_NO_UPD_LAST;
|
|
||||||
|
|
||||||
// Layer 2: predict from L, G, ARF; update none.
|
// Layer 2: predict from L, G, ARF; update none.
|
||||||
layer_flags[7] = layer_flags[3];
|
layer_flags[7] = layer_flags[3];
|
||||||
@ -310,8 +283,7 @@ static void set_temporal_layer_pattern(int num_temporal_layers,
|
|||||||
/* The periodicity of the pattern given the number of temporal layers. */
|
/* The periodicity of the pattern given the number of temporal layers. */
|
||||||
static int periodicity_to_num_layers[MAX_NUM_TEMPORAL_LAYERS] = { 1, 8, 8 };
|
static int periodicity_to_num_layers[MAX_NUM_TEMPORAL_LAYERS] = { 1, 8, 8 };
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv) {
|
||||||
{
|
|
||||||
FILE *infile, *outfile[NUM_ENCODERS];
|
FILE *infile, *outfile[NUM_ENCODERS];
|
||||||
FILE *downsampled_input[NUM_ENCODERS - 1];
|
FILE *downsampled_input[NUM_ENCODERS - 1];
|
||||||
char filename[50];
|
char filename[50];
|
||||||
@ -330,8 +302,7 @@ int main(int argc, char **argv)
|
|||||||
int flags = 0;
|
int flags = 0;
|
||||||
int layer_id = 0;
|
int layer_id = 0;
|
||||||
|
|
||||||
int layer_flags[VPX_TS_MAX_PERIODICITY * NUM_ENCODERS]
|
int layer_flags[VPX_TS_MAX_PERIODICITY * NUM_ENCODERS] = { 0 };
|
||||||
= {0};
|
|
||||||
int flag_periodicity;
|
int flag_periodicity;
|
||||||
|
|
||||||
/*Currently, only realtime mode is supported in multi-resolution encoding.*/
|
/*Currently, only realtime mode is supported in multi-resolution encoding.*/
|
||||||
@ -369,8 +340,10 @@ int main(int argc, char **argv)
|
|||||||
unsigned int num_temporal_layers[NUM_ENCODERS] = { 3, 3, 3 };
|
unsigned int num_temporal_layers[NUM_ENCODERS] = { 3, 3, 3 };
|
||||||
|
|
||||||
if (argc != (7 + 3 * NUM_ENCODERS))
|
if (argc != (7 + 3 * NUM_ENCODERS))
|
||||||
die("Usage: %s <width> <height> <frame_rate> <infile> <outfile(s)> "
|
die(
|
||||||
"<rate_encoder(s)> <temporal_layer(s)> <key_frame_insert> <output psnr?> \n",
|
"Usage: %s <width> <height> <frame_rate> <infile> <outfile(s)> "
|
||||||
|
"<rate_encoder(s)> <temporal_layer(s)> <key_frame_insert> <output "
|
||||||
|
"psnr?> \n",
|
||||||
argv[0]);
|
argv[0]);
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(interface));
|
printf("Using %s\n", vpx_codec_iface_name(interface));
|
||||||
@ -387,10 +360,8 @@ int main(int argc, char **argv)
|
|||||||
die("Failed to open %s for reading", argv[4]);
|
die("Failed to open %s for reading", argv[4]);
|
||||||
|
|
||||||
/* Open output file for each encoder to output bitstreams */
|
/* Open output file for each encoder to output bitstreams */
|
||||||
for (i=0; i< NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
if (!target_bitrate[i]) {
|
||||||
if(!target_bitrate[i])
|
|
||||||
{
|
|
||||||
outfile[i] = NULL;
|
outfile[i] = NULL;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -400,14 +371,12 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Bitrates per spatial layer: overwrite default rates above.
|
// Bitrates per spatial layer: overwrite default rates above.
|
||||||
for (i=0; i< NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
target_bitrate[i] = strtol(argv[NUM_ENCODERS + 5 + i], NULL, 0);
|
target_bitrate[i] = strtol(argv[NUM_ENCODERS + 5 + i], NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Temporal layers per spatial layers: overwrite default settings above.
|
// Temporal layers per spatial layers: overwrite default settings above.
|
||||||
for (i=0; i< NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
num_temporal_layers[i] = strtol(argv[2 * NUM_ENCODERS + 5 + i], NULL, 0);
|
num_temporal_layers[i] = strtol(argv[2 * NUM_ENCODERS + 5 + i], NULL, 0);
|
||||||
if (num_temporal_layers[i] < 1 || num_temporal_layers[i] > 3)
|
if (num_temporal_layers[i] < 1 || num_temporal_layers[i] > 3)
|
||||||
die("Invalid temporal layers: %d, Must be 1, 2, or 3. \n",
|
die("Invalid temporal layers: %d, Must be 1, 2, or 3. \n",
|
||||||
@ -415,11 +384,9 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Open file to write out each spatially downsampled input stream. */
|
/* Open file to write out each spatially downsampled input stream. */
|
||||||
for (i=0; i< NUM_ENCODERS - 1; i++)
|
for (i = 0; i < NUM_ENCODERS - 1; i++) {
|
||||||
{
|
|
||||||
// Highest resoln is encoder 0.
|
// Highest resoln is encoder 0.
|
||||||
if (sprintf(filename,"ds%d.yuv",NUM_ENCODERS - i) < 0)
|
if (sprintf(filename, "ds%d.yuv", NUM_ENCODERS - i) < 0) {
|
||||||
{
|
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
downsampled_input[i] = fopen(filename, "wb");
|
downsampled_input[i] = fopen(filename, "wb");
|
||||||
@ -429,10 +396,8 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
show_psnr = strtol(argv[3 * NUM_ENCODERS + 6], NULL, 0);
|
show_psnr = strtol(argv[3 * NUM_ENCODERS + 6], NULL, 0);
|
||||||
|
|
||||||
|
|
||||||
/* Populate default encoder configuration */
|
/* Populate default encoder configuration */
|
||||||
for (i=0; i< NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
res[i] = vpx_codec_enc_config_default(interface, &cfg[i], 0);
|
res[i] = vpx_codec_enc_config_default(interface, &cfg[i], 0);
|
||||||
if (res[i]) {
|
if (res[i]) {
|
||||||
printf("Failed to get config: %s\n", vpx_codec_err_to_string(res[i]));
|
printf("Failed to get config: %s\n", vpx_codec_err_to_string(res[i]));
|
||||||
@ -472,8 +437,7 @@ int main(int argc, char **argv)
|
|||||||
cfg[0].g_timebase.den = framerate;
|
cfg[0].g_timebase.den = framerate;
|
||||||
|
|
||||||
/* Other-resolution encoder settings */
|
/* Other-resolution encoder settings */
|
||||||
for (i=1; i< NUM_ENCODERS; i++)
|
for (i = 1; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
memcpy(&cfg[i], &cfg[0], sizeof(vpx_codec_enc_cfg_t));
|
memcpy(&cfg[i], &cfg[0], sizeof(vpx_codec_enc_cfg_t));
|
||||||
|
|
||||||
cfg[i].rc_target_bitrate = target_bitrate[i];
|
cfg[i].rc_target_bitrate = target_bitrate[i];
|
||||||
@ -495,7 +459,6 @@ int main(int argc, char **argv)
|
|||||||
if ((cfg[i].g_h) % 2) cfg[i].g_h++;
|
if ((cfg[i].g_h) % 2) cfg[i].g_h++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set the number of threads per encode/spatial layer.
|
// Set the number of threads per encode/spatial layer.
|
||||||
// (1, 1, 1) means no encoder threading.
|
// (1, 1, 1) means no encoder threading.
|
||||||
cfg[0].g_threads = 2;
|
cfg[0].g_threads = 2;
|
||||||
@ -513,14 +476,11 @@ int main(int argc, char **argv)
|
|||||||
read_frame_p = read_frame_by_row;
|
read_frame_p = read_frame_by_row;
|
||||||
|
|
||||||
for (i = 0; i < NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++)
|
||||||
if(outfile[i])
|
if (outfile[i]) write_ivf_file_header(outfile[i], &cfg[i], 0);
|
||||||
write_ivf_file_header(outfile[i], &cfg[i], 0);
|
|
||||||
|
|
||||||
/* Temporal layers settings */
|
/* Temporal layers settings */
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
set_temporal_layer_pattern(num_temporal_layers[i], &cfg[i],
|
||||||
set_temporal_layer_pattern(num_temporal_layers[i],
|
|
||||||
&cfg[i],
|
|
||||||
cfg[i].rc_target_bitrate,
|
cfg[i].rc_target_bitrate,
|
||||||
&layer_flags[i * VPX_TS_MAX_PERIODICITY]);
|
&layer_flags[i * VPX_TS_MAX_PERIODICITY]);
|
||||||
}
|
}
|
||||||
@ -532,8 +492,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
/* The extra encoding configuration parameters can be set as follows. */
|
/* The extra encoding configuration parameters can be set as follows. */
|
||||||
/* Set encoding speed */
|
/* Set encoding speed */
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
int speed = -6;
|
int speed = -6;
|
||||||
/* Lower speed for the lowest resolution. */
|
/* Lower speed for the lowest resolution. */
|
||||||
if (i == NUM_ENCODERS - 1) speed = -4;
|
if (i == NUM_ENCODERS - 1) speed = -4;
|
||||||
@ -542,8 +501,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Set static threshold = 1 for all encoders */
|
/* Set static threshold = 1 for all encoders */
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
if (vpx_codec_control(&codec[i], VP8E_SET_STATIC_THRESHOLD, 1))
|
if (vpx_codec_control(&codec[i], VP8E_SET_STATIC_THRESHOLD, 1))
|
||||||
die_codec(&codec[i], "Failed to set static threshold");
|
die_codec(&codec[i], "Failed to set static threshold");
|
||||||
}
|
}
|
||||||
@ -552,22 +510,19 @@ int main(int argc, char **argv)
|
|||||||
/* Enable denoising for the highest-resolution encoder. */
|
/* Enable denoising for the highest-resolution encoder. */
|
||||||
if (vpx_codec_control(&codec[0], VP8E_SET_NOISE_SENSITIVITY, 1))
|
if (vpx_codec_control(&codec[0], VP8E_SET_NOISE_SENSITIVITY, 1))
|
||||||
die_codec(&codec[0], "Failed to set noise_sensitivity");
|
die_codec(&codec[0], "Failed to set noise_sensitivity");
|
||||||
for ( i=1; i< NUM_ENCODERS; i++)
|
for (i = 1; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
if (vpx_codec_control(&codec[i], VP8E_SET_NOISE_SENSITIVITY, 0))
|
if (vpx_codec_control(&codec[i], VP8E_SET_NOISE_SENSITIVITY, 0))
|
||||||
die_codec(&codec[i], "Failed to set noise_sensitivity");
|
die_codec(&codec[i], "Failed to set noise_sensitivity");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the number of token partitions */
|
/* Set the number of token partitions */
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
if (vpx_codec_control(&codec[i], VP8E_SET_TOKEN_PARTITIONS, 1))
|
if (vpx_codec_control(&codec[i], VP8E_SET_TOKEN_PARTITIONS, 1))
|
||||||
die_codec(&codec[i], "Failed to set static threshold");
|
die_codec(&codec[i], "Failed to set static threshold");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the max intra target bitrate */
|
/* Set the max intra target bitrate */
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
unsigned int max_intra_size_pct =
|
unsigned int max_intra_size_pct =
|
||||||
(int)(((double)cfg[0].rc_buf_optimal_sz * 0.5) * framerate / 10);
|
(int)(((double)cfg[0].rc_buf_optimal_sz * 0.5) * framerate / 10);
|
||||||
if (vpx_codec_control(&codec[i], VP8E_SET_MAX_INTRA_BITRATE_PCT,
|
if (vpx_codec_control(&codec[i], VP8E_SET_MAX_INTRA_BITRATE_PCT,
|
||||||
@ -579,8 +534,7 @@ int main(int argc, char **argv)
|
|||||||
frame_avail = 1;
|
frame_avail = 1;
|
||||||
got_data = 0;
|
got_data = 0;
|
||||||
|
|
||||||
while(frame_avail || got_data)
|
while (frame_avail || got_data) {
|
||||||
{
|
|
||||||
struct vpx_usec_timer timer;
|
struct vpx_usec_timer timer;
|
||||||
vpx_codec_iter_t iter[NUM_ENCODERS] = { NULL };
|
vpx_codec_iter_t iter[NUM_ENCODERS] = { NULL };
|
||||||
const vpx_codec_cx_pkt_t *pkt[NUM_ENCODERS];
|
const vpx_codec_cx_pkt_t *pkt[NUM_ENCODERS];
|
||||||
@ -588,47 +542,39 @@ int main(int argc, char **argv)
|
|||||||
flags = 0;
|
flags = 0;
|
||||||
frame_avail = read_frame_p(infile, &raw[0]);
|
frame_avail = read_frame_p(infile, &raw[0]);
|
||||||
|
|
||||||
if(frame_avail)
|
if (frame_avail) {
|
||||||
{
|
for (i = 1; i < NUM_ENCODERS; i++) {
|
||||||
for ( i=1; i<NUM_ENCODERS; i++)
|
|
||||||
{
|
|
||||||
/*Scale the image down a number of times by downsampling factor*/
|
/*Scale the image down a number of times by downsampling factor*/
|
||||||
/* FilterMode 1 or 2 give better psnr than FilterMode 0. */
|
/* FilterMode 1 or 2 give better psnr than FilterMode 0. */
|
||||||
I420Scale(raw[i-1].planes[VPX_PLANE_Y], raw[i-1].stride[VPX_PLANE_Y],
|
I420Scale(
|
||||||
|
raw[i - 1].planes[VPX_PLANE_Y], raw[i - 1].stride[VPX_PLANE_Y],
|
||||||
raw[i - 1].planes[VPX_PLANE_U], raw[i - 1].stride[VPX_PLANE_U],
|
raw[i - 1].planes[VPX_PLANE_U], raw[i - 1].stride[VPX_PLANE_U],
|
||||||
raw[i - 1].planes[VPX_PLANE_V], raw[i - 1].stride[VPX_PLANE_V],
|
raw[i - 1].planes[VPX_PLANE_V], raw[i - 1].stride[VPX_PLANE_V],
|
||||||
raw[i-1].d_w, raw[i-1].d_h,
|
raw[i - 1].d_w, raw[i - 1].d_h, raw[i].planes[VPX_PLANE_Y],
|
||||||
raw[i].planes[VPX_PLANE_Y], raw[i].stride[VPX_PLANE_Y],
|
raw[i].stride[VPX_PLANE_Y], raw[i].planes[VPX_PLANE_U],
|
||||||
raw[i].planes[VPX_PLANE_U], raw[i].stride[VPX_PLANE_U],
|
raw[i].stride[VPX_PLANE_U], raw[i].planes[VPX_PLANE_V],
|
||||||
raw[i].planes[VPX_PLANE_V], raw[i].stride[VPX_PLANE_V],
|
raw[i].stride[VPX_PLANE_V], raw[i].d_w, raw[i].d_h, 1);
|
||||||
raw[i].d_w, raw[i].d_h, 1);
|
|
||||||
/* Write out down-sampled input. */
|
/* Write out down-sampled input. */
|
||||||
length_frame = cfg[i].g_w * cfg[i].g_h * 3 / 2;
|
length_frame = cfg[i].g_w * cfg[i].g_h * 3 / 2;
|
||||||
if (fwrite(raw[i].planes[0], 1, length_frame,
|
if (fwrite(raw[i].planes[0], 1, length_frame,
|
||||||
downsampled_input[NUM_ENCODERS - i - 1]) !=
|
downsampled_input[NUM_ENCODERS - i - 1]) != length_frame) {
|
||||||
length_frame)
|
|
||||||
{
|
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the flags (reference and update) for all the encoders.*/
|
/* Set the flags (reference and update) for all the encoders.*/
|
||||||
for ( i=0; i<NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
layer_id = cfg[i].ts_layer_id[frame_cnt % cfg[i].ts_periodicity];
|
layer_id = cfg[i].ts_layer_id[frame_cnt % cfg[i].ts_periodicity];
|
||||||
flags = 0;
|
flags = 0;
|
||||||
flag_periodicity = periodicity_to_num_layers
|
flag_periodicity = periodicity_to_num_layers[num_temporal_layers[i] - 1];
|
||||||
[num_temporal_layers[i] - 1];
|
|
||||||
flags = layer_flags[i * VPX_TS_MAX_PERIODICITY +
|
flags = layer_flags[i * VPX_TS_MAX_PERIODICITY +
|
||||||
frame_cnt % flag_periodicity];
|
frame_cnt % flag_periodicity];
|
||||||
// Key frame flag for first frame.
|
// Key frame flag for first frame.
|
||||||
if (frame_cnt == 0)
|
if (frame_cnt == 0) {
|
||||||
{
|
|
||||||
flags |= VPX_EFLAG_FORCE_KF;
|
flags |= VPX_EFLAG_FORCE_KF;
|
||||||
}
|
}
|
||||||
if (frame_cnt > 0 && frame_cnt == key_frame_insert)
|
if (frame_cnt > 0 && frame_cnt == key_frame_insert) {
|
||||||
{
|
|
||||||
flags = VPX_EFLAG_FORCE_KF;
|
flags = VPX_EFLAG_FORCE_KF;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -640,46 +586,42 @@ int main(int argc, char **argv)
|
|||||||
/* Note the flags must be set to 0 in the encode call if they are set
|
/* Note the flags must be set to 0 in the encode call if they are set
|
||||||
for each frame with the vpx_codec_control(), as done above. */
|
for each frame with the vpx_codec_control(), as done above. */
|
||||||
vpx_usec_timer_start(&timer);
|
vpx_usec_timer_start(&timer);
|
||||||
if(vpx_codec_encode(&codec[0], frame_avail? &raw[0] : NULL,
|
if (vpx_codec_encode(&codec[0], frame_avail ? &raw[0] : NULL, frame_cnt, 1,
|
||||||
frame_cnt, 1, 0, arg_deadline))
|
0, arg_deadline)) {
|
||||||
{
|
|
||||||
die_codec(&codec[0], "Failed to encode frame");
|
die_codec(&codec[0], "Failed to encode frame");
|
||||||
}
|
}
|
||||||
vpx_usec_timer_mark(&timer);
|
vpx_usec_timer_mark(&timer);
|
||||||
cx_time += vpx_usec_timer_elapsed(&timer);
|
cx_time += vpx_usec_timer_elapsed(&timer);
|
||||||
|
|
||||||
for (i=NUM_ENCODERS-1; i>=0 ; i--)
|
for (i = NUM_ENCODERS - 1; i >= 0; i--) {
|
||||||
{
|
|
||||||
got_data = 0;
|
got_data = 0;
|
||||||
while( (pkt[i] = vpx_codec_get_cx_data(&codec[i], &iter[i])) )
|
while ((pkt[i] = vpx_codec_get_cx_data(&codec[i], &iter[i]))) {
|
||||||
{
|
|
||||||
got_data = 1;
|
got_data = 1;
|
||||||
switch (pkt[i]->kind) {
|
switch (pkt[i]->kind) {
|
||||||
case VPX_CODEC_CX_FRAME_PKT:
|
case VPX_CODEC_CX_FRAME_PKT:
|
||||||
write_ivf_frame_header(outfile[i], pkt[i]);
|
write_ivf_frame_header(outfile[i], pkt[i]);
|
||||||
(void) fwrite(pkt[i]->data.frame.buf, 1,
|
(void)fwrite(pkt[i]->data.frame.buf, 1, pkt[i]->data.frame.sz,
|
||||||
pkt[i]->data.frame.sz, outfile[i]);
|
outfile[i]);
|
||||||
break;
|
break;
|
||||||
case VPX_CODEC_PSNR_PKT:
|
case VPX_CODEC_PSNR_PKT:
|
||||||
if (show_psnr)
|
if (show_psnr) {
|
||||||
{
|
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
psnr_sse_total[i] += pkt[i]->data.psnr.sse[0];
|
psnr_sse_total[i] += pkt[i]->data.psnr.sse[0];
|
||||||
psnr_samples_total[i] += pkt[i]->data.psnr.samples[0];
|
psnr_samples_total[i] += pkt[i]->data.psnr.samples[0];
|
||||||
for (j = 0; j < 4; j++)
|
for (j = 0; j < 4; j++) {
|
||||||
{
|
|
||||||
psnr_totals[i][j] += pkt[i]->data.psnr.psnr[j];
|
psnr_totals[i][j] += pkt[i]->data.psnr.psnr[j];
|
||||||
}
|
}
|
||||||
psnr_count[i]++;
|
psnr_count[i]++;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default: break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
printf(pkt[i]->kind == VPX_CODEC_CX_FRAME_PKT
|
printf(pkt[i]->kind == VPX_CODEC_CX_FRAME_PKT &&
|
||||||
&& (pkt[i]->data.frame.flags & VPX_FRAME_IS_KEY)? "K":"");
|
(pkt[i]->data.frame.flags & VPX_FRAME_IS_KEY)
|
||||||
|
? "K"
|
||||||
|
: "");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -687,27 +629,23 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
||||||
frame_cnt,
|
frame_cnt, 1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
||||||
1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
|
||||||
1000000 * (double)frame_cnt / (double)cx_time);
|
1000000 * (double)frame_cnt / (double)cx_time);
|
||||||
|
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
|
|
||||||
printf("Processed %ld frames.\n", (long int)frame_cnt - 1);
|
printf("Processed %ld frames.\n", (long int)frame_cnt - 1);
|
||||||
for (i=0; i< NUM_ENCODERS; i++)
|
for (i = 0; i < NUM_ENCODERS; i++) {
|
||||||
{
|
|
||||||
/* Calculate PSNR and print it out */
|
/* Calculate PSNR and print it out */
|
||||||
if ( (show_psnr) && (psnr_count[i]>0) )
|
if ((show_psnr) && (psnr_count[i] > 0)) {
|
||||||
{
|
|
||||||
int j;
|
int j;
|
||||||
double ovpsnr = sse_to_psnr(psnr_samples_total[i], 255.0,
|
double ovpsnr =
|
||||||
psnr_sse_total[i]);
|
sse_to_psnr(psnr_samples_total[i], 255.0, psnr_sse_total[i]);
|
||||||
|
|
||||||
fprintf(stderr, "\n ENC%d PSNR (Overall/Avg/Y/U/V)", i);
|
fprintf(stderr, "\n ENC%d PSNR (Overall/Avg/Y/U/V)", i);
|
||||||
|
|
||||||
fprintf(stderr, " %.3lf", ovpsnr);
|
fprintf(stderr, " %.3lf", ovpsnr);
|
||||||
for (j = 0; j < 4; j++)
|
for (j = 0; j < 4; j++) {
|
||||||
{
|
|
||||||
fprintf(stderr, " %.3lf", psnr_totals[i][j] / psnr_count[i]);
|
fprintf(stderr, " %.3lf", psnr_totals[i][j] / psnr_count[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -717,8 +655,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
vpx_img_free(&raw[i]);
|
vpx_img_free(&raw[i]);
|
||||||
|
|
||||||
if(!outfile[i])
|
if (!outfile[i]) continue;
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Try to rewrite the file header with the actual frame count */
|
/* Try to rewrite the file header with the actual frame count */
|
||||||
if (!fseek(outfile[i], 0, SEEK_SET))
|
if (!fseek(outfile[i], 0, SEEK_SET))
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// VP8 Set Reference Frame
|
// VP8 Set Reference Frame
|
||||||
// =======================
|
// =======================
|
||||||
//
|
//
|
||||||
@ -64,25 +63,21 @@ void usage_exit(void) {
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *codec,
|
static int encode_frame(vpx_codec_ctx_t *codec, vpx_image_t *img,
|
||||||
vpx_image_t *img,
|
int frame_index, VpxVideoWriter *writer) {
|
||||||
int frame_index,
|
|
||||||
VpxVideoWriter *writer) {
|
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1, 0,
|
const vpx_codec_err_t res =
|
||||||
VPX_DL_GOOD_QUALITY);
|
vpx_codec_encode(codec, img, frame_index, 1, 0, VPX_DL_GOOD_QUALITY);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(codec, "Failed to encode frame");
|
||||||
die_codec(codec, "Failed to encode frame");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
|
|
||||||
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
||||||
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
||||||
if (!vpx_video_writer_write_frame(writer,
|
if (!vpx_video_writer_write_frame(writer, pkt->data.frame.buf,
|
||||||
pkt->data.frame.buf,
|
|
||||||
pkt->data.frame.sz,
|
pkt->data.frame.sz,
|
||||||
pkt->data.frame.pts)) {
|
pkt->data.frame.pts)) {
|
||||||
die_codec(codec, "Failed to write compressed frame");
|
die_codec(codec, "Failed to write compressed frame");
|
||||||
@ -112,17 +107,14 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc != 6)
|
if (argc != 6) die("Invalid number of arguments");
|
||||||
die("Invalid number of arguments");
|
|
||||||
|
|
||||||
// TODO(dkovalev): add vp9 support and rename the file accordingly
|
// TODO(dkovalev): add vp9 support and rename the file accordingly
|
||||||
encoder = get_vpx_encoder_by_name("vp8");
|
encoder = get_vpx_encoder_by_name("vp8");
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
update_frame_num = atoi(argv[5]);
|
update_frame_num = atoi(argv[5]);
|
||||||
if (!update_frame_num)
|
if (!update_frame_num) die("Couldn't parse frame number '%s'\n", argv[5]);
|
||||||
die("Couldn't parse frame number '%s'\n", argv[5]);
|
|
||||||
|
|
||||||
info.codec_fourcc = encoder->fourcc;
|
info.codec_fourcc = encoder->fourcc;
|
||||||
info.frame_width = strtol(argv[1], NULL, 0);
|
info.frame_width = strtol(argv[1], NULL, 0);
|
||||||
@ -130,10 +122,8 @@ int main(int argc, char **argv) {
|
|||||||
info.time_base.numerator = 1;
|
info.time_base.numerator = 1;
|
||||||
info.time_base.denominator = fps;
|
info.time_base.denominator = fps;
|
||||||
|
|
||||||
if (info.frame_width <= 0 ||
|
if (info.frame_width <= 0 || info.frame_height <= 0 ||
|
||||||
info.frame_height <= 0 ||
|
(info.frame_width % 2) != 0 || (info.frame_height % 2) != 0) {
|
||||||
(info.frame_width % 2) != 0 ||
|
|
||||||
(info.frame_height % 2) != 0) {
|
|
||||||
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -145,8 +135,7 @@ int main(int argc, char **argv) {
|
|||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to get default codec config.");
|
||||||
die_codec(&codec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = info.frame_width;
|
cfg.g_w = info.frame_width;
|
||||||
cfg.g_h = info.frame_height;
|
cfg.g_h = info.frame_height;
|
||||||
@ -155,8 +144,7 @@ int main(int argc, char **argv) {
|
|||||||
cfg.rc_target_bitrate = bitrate;
|
cfg.rc_target_bitrate = bitrate;
|
||||||
|
|
||||||
writer = vpx_video_writer_open(argv[4], kContainerIVF, &info);
|
writer = vpx_video_writer_open(argv[4], kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing.", argv[4]);
|
||||||
die("Failed to open %s for writing.", argv[4]);
|
|
||||||
|
|
||||||
if (!(infile = fopen(argv[3], "rb")))
|
if (!(infile = fopen(argv[3], "rb")))
|
||||||
die("Failed to open %s for reading.", argv[3]);
|
die("Failed to open %s for reading.", argv[3]);
|
||||||
@ -178,15 +166,15 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (encode_frame(&codec, NULL, -1, writer)) {}
|
while (encode_frame(&codec, NULL, -1, writer)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
printf("Processed %d frames.\n", frame_count);
|
printf("Processed %d frames.\n", frame_count);
|
||||||
|
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
|
|
||||||
|
@ -21,32 +21,28 @@
|
|||||||
static const char *exec_name;
|
static const char *exec_name;
|
||||||
|
|
||||||
void usage_exit(void) {
|
void usage_exit(void) {
|
||||||
fprintf(stderr, "vp9_lossless_encoder: Example demonstrating VP9 lossless "
|
fprintf(stderr,
|
||||||
|
"vp9_lossless_encoder: Example demonstrating VP9 lossless "
|
||||||
"encoding feature. Supports raw input only.\n");
|
"encoding feature. Supports raw input only.\n");
|
||||||
fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile>\n", exec_name);
|
fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile>\n", exec_name);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *codec,
|
static int encode_frame(vpx_codec_ctx_t *codec, vpx_image_t *img,
|
||||||
vpx_image_t *img,
|
int frame_index, int flags, VpxVideoWriter *writer) {
|
||||||
int frame_index,
|
|
||||||
int flags,
|
|
||||||
VpxVideoWriter *writer) {
|
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1,
|
const vpx_codec_err_t res =
|
||||||
flags, VPX_DL_GOOD_QUALITY);
|
vpx_codec_encode(codec, img, frame_index, 1, flags, VPX_DL_GOOD_QUALITY);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(codec, "Failed to encode frame");
|
||||||
die_codec(codec, "Failed to encode frame");
|
|
||||||
|
|
||||||
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
while ((pkt = vpx_codec_get_cx_data(codec, &iter)) != NULL) {
|
||||||
got_pkts = 1;
|
got_pkts = 1;
|
||||||
|
|
||||||
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
|
||||||
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
|
||||||
if (!vpx_video_writer_write_frame(writer,
|
if (!vpx_video_writer_write_frame(writer, pkt->data.frame.buf,
|
||||||
pkt->data.frame.buf,
|
|
||||||
pkt->data.frame.sz,
|
pkt->data.frame.sz,
|
||||||
pkt->data.frame.pts)) {
|
pkt->data.frame.pts)) {
|
||||||
die_codec(codec, "Failed to write compressed frame");
|
die_codec(codec, "Failed to write compressed frame");
|
||||||
@ -73,12 +69,10 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc < 5)
|
if (argc < 5) die("Invalid number of arguments");
|
||||||
die("Invalid number of arguments");
|
|
||||||
|
|
||||||
encoder = get_vpx_encoder_by_name("vp9");
|
encoder = get_vpx_encoder_by_name("vp9");
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
info.codec_fourcc = encoder->fourcc;
|
info.codec_fourcc = encoder->fourcc;
|
||||||
info.frame_width = strtol(argv[1], NULL, 0);
|
info.frame_width = strtol(argv[1], NULL, 0);
|
||||||
@ -86,10 +80,8 @@ int main(int argc, char **argv) {
|
|||||||
info.time_base.numerator = 1;
|
info.time_base.numerator = 1;
|
||||||
info.time_base.denominator = fps;
|
info.time_base.denominator = fps;
|
||||||
|
|
||||||
if (info.frame_width <= 0 ||
|
if (info.frame_width <= 0 || info.frame_height <= 0 ||
|
||||||
info.frame_height <= 0 ||
|
(info.frame_width % 2) != 0 || (info.frame_height % 2) != 0) {
|
||||||
(info.frame_width % 2) != 0 ||
|
|
||||||
(info.frame_height % 2) != 0) {
|
|
||||||
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,8 +93,7 @@ int main(int argc, char **argv) {
|
|||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&codec, "Failed to get default codec config.");
|
||||||
die_codec(&codec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = info.frame_width;
|
cfg.g_w = info.frame_width;
|
||||||
cfg.g_h = info.frame_height;
|
cfg.g_h = info.frame_height;
|
||||||
@ -110,8 +101,7 @@ int main(int argc, char **argv) {
|
|||||||
cfg.g_timebase.den = info.time_base.denominator;
|
cfg.g_timebase.den = info.time_base.denominator;
|
||||||
|
|
||||||
writer = vpx_video_writer_open(argv[4], kContainerIVF, &info);
|
writer = vpx_video_writer_open(argv[4], kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing.", argv[4]);
|
||||||
die("Failed to open %s for writing.", argv[4]);
|
|
||||||
|
|
||||||
if (!(infile = fopen(argv[3], "rb")))
|
if (!(infile = fopen(argv[3], "rb")))
|
||||||
die("Failed to open %s for reading.", argv[3]);
|
die("Failed to open %s for reading.", argv[3]);
|
||||||
@ -128,15 +118,15 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
while (encode_frame(&codec, NULL, -1, 0, writer)) {}
|
while (encode_frame(&codec, NULL, -1, 0, writer)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
printf("Processed %d frames.\n", frame_count);
|
printf("Processed %d frames.\n", frame_count);
|
||||||
|
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec.");
|
||||||
die_codec(&codec, "Failed to destroy codec.");
|
|
||||||
|
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
|
||||||
#include "../args.h"
|
#include "../args.h"
|
||||||
#include "../tools_common.h"
|
#include "../tools_common.h"
|
||||||
#include "../video_writer.h"
|
#include "../video_writer.h"
|
||||||
@ -54,7 +53,8 @@ static const arg_def_t spatial_layers_arg =
|
|||||||
static const arg_def_t temporal_layers_arg =
|
static const arg_def_t temporal_layers_arg =
|
||||||
ARG_DEF("tl", "temporal-layers", 1, "number of temporal SVC layers");
|
ARG_DEF("tl", "temporal-layers", 1, "number of temporal SVC layers");
|
||||||
static const arg_def_t temporal_layering_mode_arg =
|
static const arg_def_t temporal_layering_mode_arg =
|
||||||
ARG_DEF("tlm", "temporal-layering-mode", 1, "temporal layering scheme."
|
ARG_DEF("tlm", "temporal-layering-mode", 1,
|
||||||
|
"temporal layering scheme."
|
||||||
"VP9E_TEMPORAL_LAYERING_MODE");
|
"VP9E_TEMPORAL_LAYERING_MODE");
|
||||||
static const arg_def_t kf_dist_arg =
|
static const arg_def_t kf_dist_arg =
|
||||||
ARG_DEF("k", "kf-dist", 1, "number of frames between keyframes");
|
ARG_DEF("k", "kf-dist", 1, "number of frames between keyframes");
|
||||||
@ -75,7 +75,8 @@ static const arg_def_t min_bitrate_arg =
|
|||||||
static const arg_def_t max_bitrate_arg =
|
static const arg_def_t max_bitrate_arg =
|
||||||
ARG_DEF(NULL, "max-bitrate", 1, "Maximum bitrate");
|
ARG_DEF(NULL, "max-bitrate", 1, "Maximum bitrate");
|
||||||
static const arg_def_t lag_in_frame_arg =
|
static const arg_def_t lag_in_frame_arg =
|
||||||
ARG_DEF(NULL, "lag-in-frames", 1, "Number of frame to input before "
|
ARG_DEF(NULL, "lag-in-frames", 1,
|
||||||
|
"Number of frame to input before "
|
||||||
"generating any outputs");
|
"generating any outputs");
|
||||||
static const arg_def_t rc_end_usage_arg =
|
static const arg_def_t rc_end_usage_arg =
|
||||||
ARG_DEF(NULL, "rc-end-usage", 1, "0 - 3: VBR, CBR, CQ, Q");
|
ARG_DEF(NULL, "rc-end-usage", 1, "0 - 3: VBR, CBR, CQ, Q");
|
||||||
@ -86,25 +87,34 @@ static const arg_def_t aqmode_arg =
|
|||||||
|
|
||||||
#if CONFIG_VP9_HIGHBITDEPTH
|
#if CONFIG_VP9_HIGHBITDEPTH
|
||||||
static const struct arg_enum_list bitdepth_enum[] = {
|
static const struct arg_enum_list bitdepth_enum[] = {
|
||||||
{"8", VPX_BITS_8},
|
{ "8", VPX_BITS_8 }, { "10", VPX_BITS_10 }, { "12", VPX_BITS_12 }, { NULL, 0 }
|
||||||
{"10", VPX_BITS_10},
|
|
||||||
{"12", VPX_BITS_12},
|
|
||||||
{NULL, 0}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const arg_def_t bitdepth_arg =
|
static const arg_def_t bitdepth_arg = ARG_DEF_ENUM(
|
||||||
ARG_DEF_ENUM("d", "bit-depth", 1, "Bit depth for codec 8, 10 or 12. ",
|
"d", "bit-depth", 1, "Bit depth for codec 8, 10 or 12. ", bitdepth_enum);
|
||||||
bitdepth_enum);
|
|
||||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||||
|
|
||||||
|
static const arg_def_t *svc_args[] = { &frames_arg,
|
||||||
static const arg_def_t *svc_args[] = {
|
&width_arg,
|
||||||
&frames_arg, &width_arg, &height_arg,
|
&height_arg,
|
||||||
&timebase_arg, &bitrate_arg, &skip_frames_arg, &spatial_layers_arg,
|
&timebase_arg,
|
||||||
&kf_dist_arg, &scale_factors_arg, &passes_arg, &pass_arg,
|
&bitrate_arg,
|
||||||
&fpf_name_arg, &min_q_arg, &max_q_arg, &min_bitrate_arg,
|
&skip_frames_arg,
|
||||||
&max_bitrate_arg, &temporal_layers_arg, &temporal_layering_mode_arg,
|
&spatial_layers_arg,
|
||||||
&lag_in_frame_arg, &threads_arg, &aqmode_arg,
|
&kf_dist_arg,
|
||||||
|
&scale_factors_arg,
|
||||||
|
&passes_arg,
|
||||||
|
&pass_arg,
|
||||||
|
&fpf_name_arg,
|
||||||
|
&min_q_arg,
|
||||||
|
&max_q_arg,
|
||||||
|
&min_bitrate_arg,
|
||||||
|
&max_bitrate_arg,
|
||||||
|
&temporal_layers_arg,
|
||||||
|
&temporal_layering_mode_arg,
|
||||||
|
&lag_in_frame_arg,
|
||||||
|
&threads_arg,
|
||||||
|
&aqmode_arg,
|
||||||
#if OUTPUT_RC_STATS
|
#if OUTPUT_RC_STATS
|
||||||
&output_rc_stats_arg,
|
&output_rc_stats_arg,
|
||||||
#endif
|
#endif
|
||||||
@ -113,8 +123,8 @@ static const arg_def_t *svc_args[] = {
|
|||||||
&bitdepth_arg,
|
&bitdepth_arg,
|
||||||
#endif
|
#endif
|
||||||
&speed_arg,
|
&speed_arg,
|
||||||
&rc_end_usage_arg, NULL
|
&rc_end_usage_arg,
|
||||||
};
|
NULL };
|
||||||
|
|
||||||
static const uint32_t default_frames_to_skip = 0;
|
static const uint32_t default_frames_to_skip = 0;
|
||||||
static const uint32_t default_frames_to_code = 60 * 60;
|
static const uint32_t default_frames_to_code = 60 * 60;
|
||||||
@ -229,8 +239,8 @@ static void parse_command_line(int argc, const char **argv_,
|
|||||||
} else if (arg_match(&arg, &threads_arg, argi)) {
|
} else if (arg_match(&arg, &threads_arg, argi)) {
|
||||||
svc_ctx->threads = arg_parse_uint(&arg);
|
svc_ctx->threads = arg_parse_uint(&arg);
|
||||||
} else if (arg_match(&arg, &temporal_layering_mode_arg, argi)) {
|
} else if (arg_match(&arg, &temporal_layering_mode_arg, argi)) {
|
||||||
svc_ctx->temporal_layering_mode =
|
svc_ctx->temporal_layering_mode = enc_cfg->temporal_layering_mode =
|
||||||
enc_cfg->temporal_layering_mode = arg_parse_int(&arg);
|
arg_parse_int(&arg);
|
||||||
if (svc_ctx->temporal_layering_mode) {
|
if (svc_ctx->temporal_layering_mode) {
|
||||||
enc_cfg->g_error_resilient = 1;
|
enc_cfg->g_error_resilient = 1;
|
||||||
}
|
}
|
||||||
@ -360,9 +370,8 @@ static void parse_command_line(int argc, const char **argv_,
|
|||||||
"num: %d, den: %d, bitrate: %d,\n"
|
"num: %d, den: %d, bitrate: %d,\n"
|
||||||
"gop size: %d\n",
|
"gop size: %d\n",
|
||||||
vpx_codec_iface_name(vpx_codec_vp9_cx()), app_input->frames_to_code,
|
vpx_codec_iface_name(vpx_codec_vp9_cx()), app_input->frames_to_code,
|
||||||
app_input->frames_to_skip,
|
app_input->frames_to_skip, svc_ctx->spatial_layers, enc_cfg->g_w,
|
||||||
svc_ctx->spatial_layers, enc_cfg->g_w, enc_cfg->g_h,
|
enc_cfg->g_h, enc_cfg->g_timebase.num, enc_cfg->g_timebase.den,
|
||||||
enc_cfg->g_timebase.num, enc_cfg->g_timebase.den,
|
|
||||||
enc_cfg->rc_target_bitrate, enc_cfg->kf_max_dist);
|
enc_cfg->rc_target_bitrate, enc_cfg->kf_max_dist);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -412,17 +421,14 @@ static void set_rate_control_stats(struct RateControlStats *rc,
|
|||||||
if (cfg->ts_number_layers == 1)
|
if (cfg->ts_number_layers == 1)
|
||||||
rc->layer_framerate[layer] = framerate;
|
rc->layer_framerate[layer] = framerate;
|
||||||
else
|
else
|
||||||
rc->layer_framerate[layer] =
|
rc->layer_framerate[layer] = framerate / cfg->ts_rate_decimator[tl];
|
||||||
framerate / cfg->ts_rate_decimator[tl];
|
|
||||||
if (tl > 0) {
|
if (tl > 0) {
|
||||||
rc->layer_pfb[layer] = 1000.0 *
|
rc->layer_pfb[layer] =
|
||||||
(cfg->layer_target_bitrate[layer] -
|
1000.0 * (cfg->layer_target_bitrate[layer] -
|
||||||
cfg->layer_target_bitrate[layer - 1]) /
|
cfg->layer_target_bitrate[layer - 1]) /
|
||||||
(rc->layer_framerate[layer] -
|
(rc->layer_framerate[layer] - rc->layer_framerate[layer - 1]);
|
||||||
rc->layer_framerate[layer - 1]);
|
|
||||||
} else {
|
} else {
|
||||||
rc->layer_pfb[tlayer0] = 1000.0 *
|
rc->layer_pfb[tlayer0] = 1000.0 * cfg->layer_target_bitrate[tlayer0] /
|
||||||
cfg->layer_target_bitrate[tlayer0] /
|
|
||||||
rc->layer_framerate[tlayer0];
|
rc->layer_framerate[tlayer0];
|
||||||
}
|
}
|
||||||
rc->layer_input_frames[layer] = 0;
|
rc->layer_input_frames[layer] = 0;
|
||||||
@ -451,17 +457,19 @@ static void printout_rate_control_summary(struct RateControlStats *rc,
|
|||||||
for (sl = 0; sl < cfg->ss_number_layers; ++sl) {
|
for (sl = 0; sl < cfg->ss_number_layers; ++sl) {
|
||||||
for (tl = 0; tl < cfg->ts_number_layers; ++tl) {
|
for (tl = 0; tl < cfg->ts_number_layers; ++tl) {
|
||||||
const int layer = sl * cfg->ts_number_layers + tl;
|
const int layer = sl * cfg->ts_number_layers + tl;
|
||||||
const int num_dropped = (tl > 0) ?
|
const int num_dropped =
|
||||||
(rc->layer_input_frames[layer] - rc->layer_enc_frames[layer]) :
|
(tl > 0)
|
||||||
(rc->layer_input_frames[layer] - rc->layer_enc_frames[layer] - 1);
|
? (rc->layer_input_frames[layer] - rc->layer_enc_frames[layer])
|
||||||
if (!sl)
|
: (rc->layer_input_frames[layer] - rc->layer_enc_frames[layer] -
|
||||||
tot_num_frames += rc->layer_input_frames[layer];
|
1);
|
||||||
|
if (!sl) tot_num_frames += rc->layer_input_frames[layer];
|
||||||
rc->layer_encoding_bitrate[layer] = 0.001 * rc->layer_framerate[layer] *
|
rc->layer_encoding_bitrate[layer] = 0.001 * rc->layer_framerate[layer] *
|
||||||
rc->layer_encoding_bitrate[layer] / tot_num_frames;
|
rc->layer_encoding_bitrate[layer] /
|
||||||
rc->layer_avg_frame_size[layer] = rc->layer_avg_frame_size[layer] /
|
tot_num_frames;
|
||||||
rc->layer_enc_frames[layer];
|
rc->layer_avg_frame_size[layer] =
|
||||||
rc->layer_avg_rate_mismatch[layer] =
|
rc->layer_avg_frame_size[layer] / rc->layer_enc_frames[layer];
|
||||||
100.0 * rc->layer_avg_rate_mismatch[layer] /
|
rc->layer_avg_rate_mismatch[layer] = 100.0 *
|
||||||
|
rc->layer_avg_rate_mismatch[layer] /
|
||||||
rc->layer_enc_frames[layer];
|
rc->layer_enc_frames[layer];
|
||||||
printf("For layer#: sl%d tl%d \n", sl, tl);
|
printf("For layer#: sl%d tl%d \n", sl, tl);
|
||||||
printf("Bitrate (target vs actual): %d %f.0 kbps\n",
|
printf("Bitrate (target vs actual): %d %f.0 kbps\n",
|
||||||
@ -469,9 +477,9 @@ static void printout_rate_control_summary(struct RateControlStats *rc,
|
|||||||
rc->layer_encoding_bitrate[layer]);
|
rc->layer_encoding_bitrate[layer]);
|
||||||
printf("Average frame size (target vs actual): %f %f bits\n",
|
printf("Average frame size (target vs actual): %f %f bits\n",
|
||||||
rc->layer_pfb[layer], rc->layer_avg_frame_size[layer]);
|
rc->layer_pfb[layer], rc->layer_avg_frame_size[layer]);
|
||||||
printf("Average rate_mismatch: %f\n",
|
printf("Average rate_mismatch: %f\n", rc->layer_avg_rate_mismatch[layer]);
|
||||||
rc->layer_avg_rate_mismatch[layer]);
|
printf(
|
||||||
printf("Number of input frames, encoded (non-key) frames, "
|
"Number of input frames, encoded (non-key) frames, "
|
||||||
"and percent dropped frames: %d %d %f.0 \n",
|
"and percent dropped frames: %d %d %f.0 \n",
|
||||||
rc->layer_input_frames[layer], rc->layer_enc_frames[layer],
|
rc->layer_input_frames[layer], rc->layer_enc_frames[layer],
|
||||||
100.0 * num_dropped / rc->layer_input_frames[layer]);
|
100.0 * num_dropped / rc->layer_input_frames[layer]);
|
||||||
@ -486,16 +494,16 @@ static void printout_rate_control_summary(struct RateControlStats *rc,
|
|||||||
rc->avg_st_encoding_bitrate;
|
rc->avg_st_encoding_bitrate;
|
||||||
printf("Short-time stats, for window of %d frames: \n", rc->window_size);
|
printf("Short-time stats, for window of %d frames: \n", rc->window_size);
|
||||||
printf("Average, rms-variance, and percent-fluct: %f %f %f \n",
|
printf("Average, rms-variance, and percent-fluct: %f %f %f \n",
|
||||||
rc->avg_st_encoding_bitrate,
|
rc->avg_st_encoding_bitrate, sqrt(rc->variance_st_encoding_bitrate),
|
||||||
sqrt(rc->variance_st_encoding_bitrate),
|
|
||||||
perc_fluctuation);
|
perc_fluctuation);
|
||||||
if (frame_cnt != tot_num_frames)
|
if (frame_cnt != tot_num_frames)
|
||||||
die("Error: Number of input frames not equal to output encoded frames != "
|
die(
|
||||||
"%d tot_num_frames = %d\n", frame_cnt, tot_num_frames);
|
"Error: Number of input frames not equal to output encoded frames != "
|
||||||
|
"%d tot_num_frames = %d\n",
|
||||||
|
frame_cnt, tot_num_frames);
|
||||||
}
|
}
|
||||||
|
|
||||||
vpx_codec_err_t parse_superframe_index(const uint8_t *data,
|
vpx_codec_err_t parse_superframe_index(const uint8_t *data, size_t data_sz,
|
||||||
size_t data_sz,
|
|
||||||
uint32_t sizes[8], int *count) {
|
uint32_t sizes[8], int *count) {
|
||||||
// A chunk ending with a byte matching 0xc0 is an invalid chunk unless
|
// A chunk ending with a byte matching 0xc0 is an invalid chunk unless
|
||||||
// it is a super frame index. If the last byte of real video compression
|
// it is a super frame index. If the last byte of real video compression
|
||||||
@ -508,7 +516,6 @@ vpx_codec_err_t parse_superframe_index(const uint8_t *data,
|
|||||||
marker = *(data + data_sz - 1);
|
marker = *(data + data_sz - 1);
|
||||||
*count = 0;
|
*count = 0;
|
||||||
|
|
||||||
|
|
||||||
if ((marker & 0xe0) == 0xc0) {
|
if ((marker & 0xe0) == 0xc0) {
|
||||||
const uint32_t frames = (marker & 0x7) + 1;
|
const uint32_t frames = (marker & 0x7) + 1;
|
||||||
const uint32_t mag = ((marker >> 3) & 0x3) + 1;
|
const uint32_t mag = ((marker >> 3) & 0x3) + 1;
|
||||||
@ -516,8 +523,7 @@ vpx_codec_err_t parse_superframe_index(const uint8_t *data,
|
|||||||
|
|
||||||
// This chunk is marked as having a superframe index but doesn't have
|
// This chunk is marked as having a superframe index but doesn't have
|
||||||
// enough data for it, thus it's an invalid superframe index.
|
// enough data for it, thus it's an invalid superframe index.
|
||||||
if (data_sz < index_sz)
|
if (data_sz < index_sz) return VPX_CODEC_CORRUPT_FRAME;
|
||||||
return VPX_CODEC_CORRUPT_FRAME;
|
|
||||||
|
|
||||||
{
|
{
|
||||||
const uint8_t marker2 = *(data + data_sz - index_sz);
|
const uint8_t marker2 = *(data + data_sz - index_sz);
|
||||||
@ -525,8 +531,7 @@ vpx_codec_err_t parse_superframe_index(const uint8_t *data,
|
|||||||
// This chunk is marked as having a superframe index but doesn't have
|
// This chunk is marked as having a superframe index but doesn't have
|
||||||
// the matching marker byte at the front of the index therefore it's an
|
// the matching marker byte at the front of the index therefore it's an
|
||||||
// invalid chunk.
|
// invalid chunk.
|
||||||
if (marker != marker2)
|
if (marker != marker2) return VPX_CODEC_CORRUPT_FRAME;
|
||||||
return VPX_CODEC_CORRUPT_FRAME;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -537,8 +542,7 @@ vpx_codec_err_t parse_superframe_index(const uint8_t *data,
|
|||||||
for (i = 0; i < frames; ++i) {
|
for (i = 0; i < frames; ++i) {
|
||||||
uint32_t this_sz = 0;
|
uint32_t this_sz = 0;
|
||||||
|
|
||||||
for (j = 0; j < mag; ++j)
|
for (j = 0; j < mag; ++j) this_sz |= (*x++) << (j * 8);
|
||||||
this_sz |= (*x++) << (j * 8);
|
|
||||||
sizes[i] = this_sz;
|
sizes[i] = this_sz;
|
||||||
}
|
}
|
||||||
*count = frames;
|
*count = frames;
|
||||||
@ -558,32 +562,27 @@ void set_frame_flags_bypass_mode(int sl, int tl, int num_spatial_layers,
|
|||||||
for (sl = 0; sl < num_spatial_layers; ++sl) {
|
for (sl = 0; sl < num_spatial_layers; ++sl) {
|
||||||
if (!tl) {
|
if (!tl) {
|
||||||
if (!sl) {
|
if (!sl) {
|
||||||
ref_frame_config->frame_flags[sl] = VP8_EFLAG_NO_REF_GF |
|
ref_frame_config->frame_flags[sl] =
|
||||||
VP8_EFLAG_NO_REF_ARF |
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
} else {
|
} else {
|
||||||
if (is_key_frame) {
|
if (is_key_frame) {
|
||||||
ref_frame_config->frame_flags[sl] = VP8_EFLAG_NO_REF_LAST |
|
ref_frame_config->frame_flags[sl] =
|
||||||
VP8_EFLAG_NO_REF_ARF |
|
VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_REF_ARF |
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
} else {
|
} else {
|
||||||
ref_frame_config->frame_flags[sl] = VP8_EFLAG_NO_REF_ARF |
|
ref_frame_config->frame_flags[sl] =
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (tl == 1) {
|
} else if (tl == 1) {
|
||||||
if (!sl) {
|
if (!sl) {
|
||||||
ref_frame_config->frame_flags[sl] = VP8_EFLAG_NO_REF_GF |
|
ref_frame_config->frame_flags[sl] =
|
||||||
VP8_EFLAG_NO_REF_ARF |
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_GF;
|
VP8_EFLAG_NO_UPD_GF;
|
||||||
} else {
|
} else {
|
||||||
ref_frame_config->frame_flags[sl] = VP8_EFLAG_NO_REF_ARF |
|
ref_frame_config->frame_flags[sl] =
|
||||||
VP8_EFLAG_NO_UPD_LAST |
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
||||||
VP8_EFLAG_NO_UPD_GF;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (tl == 0) {
|
if (tl == 0) {
|
||||||
@ -636,8 +635,8 @@ int main(int argc, const char **argv) {
|
|||||||
|
|
||||||
// Allocate image buffer
|
// Allocate image buffer
|
||||||
#if CONFIG_VP9_HIGHBITDEPTH
|
#if CONFIG_VP9_HIGHBITDEPTH
|
||||||
if (!vpx_img_alloc(&raw, enc_cfg.g_input_bit_depth == 8 ?
|
if (!vpx_img_alloc(&raw, enc_cfg.g_input_bit_depth == 8 ? VPX_IMG_FMT_I420
|
||||||
VPX_IMG_FMT_I420 : VPX_IMG_FMT_I42016,
|
: VPX_IMG_FMT_I42016,
|
||||||
enc_cfg.g_w, enc_cfg.g_h, 32)) {
|
enc_cfg.g_w, enc_cfg.g_h, 32)) {
|
||||||
die("Failed to allocate image %dx%d\n", enc_cfg.g_w, enc_cfg.g_h);
|
die("Failed to allocate image %dx%d\n", enc_cfg.g_w, enc_cfg.g_h);
|
||||||
}
|
}
|
||||||
@ -668,8 +667,8 @@ int main(int argc, const char **argv) {
|
|||||||
|
|
||||||
if (!(app_input.passes == 2 && app_input.pass == 1)) {
|
if (!(app_input.passes == 2 && app_input.pass == 1)) {
|
||||||
// We don't save the bitstream for the 1st pass on two pass rate control
|
// We don't save the bitstream for the 1st pass on two pass rate control
|
||||||
writer = vpx_video_writer_open(app_input.output_filename, kContainerIVF,
|
writer =
|
||||||
&info);
|
vpx_video_writer_open(app_input.output_filename, kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer)
|
||||||
die("Failed to open %s for writing\n", app_input.output_filename);
|
die("Failed to open %s for writing\n", app_input.output_filename);
|
||||||
}
|
}
|
||||||
@ -683,15 +682,13 @@ int main(int argc, const char **argv) {
|
|||||||
snprintf(file_name, sizeof(file_name), "%s_t%d.ivf",
|
snprintf(file_name, sizeof(file_name), "%s_t%d.ivf",
|
||||||
app_input.output_filename, tl);
|
app_input.output_filename, tl);
|
||||||
outfile[tl] = vpx_video_writer_open(file_name, kContainerIVF, &info);
|
outfile[tl] = vpx_video_writer_open(file_name, kContainerIVF, &info);
|
||||||
if (!outfile[tl])
|
if (!outfile[tl]) die("Failed to open %s for writing", file_name);
|
||||||
die("Failed to open %s for writing", file_name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// skip initial frames
|
// skip initial frames
|
||||||
for (i = 0; i < app_input.frames_to_skip; ++i)
|
for (i = 0; i < app_input.frames_to_skip; ++i) vpx_img_read(&raw, infile);
|
||||||
vpx_img_read(&raw, infile);
|
|
||||||
|
|
||||||
if (svc_ctx.speed != -1)
|
if (svc_ctx.speed != -1)
|
||||||
vpx_codec_control(&codec, VP8E_SET_CPUUSED, svc_ctx.speed);
|
vpx_codec_control(&codec, VP8E_SET_CPUUSED, svc_ctx.speed);
|
||||||
@ -700,7 +697,6 @@ int main(int argc, const char **argv) {
|
|||||||
if (svc_ctx.speed >= 5 && svc_ctx.aqmode == 1)
|
if (svc_ctx.speed >= 5 && svc_ctx.aqmode == 1)
|
||||||
vpx_codec_control(&codec, VP9E_SET_AQ_MODE, 3);
|
vpx_codec_control(&codec, VP9E_SET_AQ_MODE, 3);
|
||||||
|
|
||||||
|
|
||||||
// Encode frames
|
// Encode frames
|
||||||
while (!end_of_stream) {
|
while (!end_of_stream) {
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
@ -729,8 +725,7 @@ int main(int argc, const char **argv) {
|
|||||||
// over all the spatial layers for the current superframe.
|
// over all the spatial layers for the current superframe.
|
||||||
vpx_codec_control(&codec, VP9E_SET_SVC_LAYER_ID, &layer_id);
|
vpx_codec_control(&codec, VP9E_SET_SVC_LAYER_ID, &layer_id);
|
||||||
set_frame_flags_bypass_mode(sl, layer_id.temporal_layer_id,
|
set_frame_flags_bypass_mode(sl, layer_id.temporal_layer_id,
|
||||||
svc_ctx.spatial_layers,
|
svc_ctx.spatial_layers, frame_cnt == 0,
|
||||||
frame_cnt == 0,
|
|
||||||
&ref_frame_config);
|
&ref_frame_config);
|
||||||
vpx_codec_control(&codec, VP9E_SET_SVC_REF_FRAME_CONFIG,
|
vpx_codec_control(&codec, VP9E_SET_SVC_REF_FRAME_CONFIG,
|
||||||
&ref_frame_config);
|
&ref_frame_config);
|
||||||
@ -743,9 +738,9 @@ int main(int argc, const char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vpx_usec_timer_start(&timer);
|
vpx_usec_timer_start(&timer);
|
||||||
res = vpx_svc_encode(&svc_ctx, &codec, (end_of_stream ? NULL : &raw),
|
res = vpx_svc_encode(
|
||||||
pts, frame_duration, svc_ctx.speed >= 5 ?
|
&svc_ctx, &codec, (end_of_stream ? NULL : &raw), pts, frame_duration,
|
||||||
VPX_DL_REALTIME : VPX_DL_GOOD_QUALITY);
|
svc_ctx.speed >= 5 ? VPX_DL_REALTIME : VPX_DL_GOOD_QUALITY);
|
||||||
vpx_usec_timer_mark(&timer);
|
vpx_usec_timer_mark(&timer);
|
||||||
cx_time += vpx_usec_timer_elapsed(&timer);
|
cx_time += vpx_usec_timer_elapsed(&timer);
|
||||||
|
|
||||||
@ -764,8 +759,7 @@ int main(int argc, const char **argv) {
|
|||||||
uint32_t sizes[8];
|
uint32_t sizes[8];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
#endif
|
#endif
|
||||||
vpx_video_writer_write_frame(writer,
|
vpx_video_writer_write_frame(writer, cx_pkt->data.frame.buf,
|
||||||
cx_pkt->data.frame.buf,
|
|
||||||
cx_pkt->data.frame.sz,
|
cx_pkt->data.frame.sz,
|
||||||
cx_pkt->data.frame.pts);
|
cx_pkt->data.frame.pts);
|
||||||
#if OUTPUT_RC_STATS
|
#if OUTPUT_RC_STATS
|
||||||
@ -787,9 +781,8 @@ int main(int argc, const char **argv) {
|
|||||||
}
|
}
|
||||||
for (tl = layer_id.temporal_layer_id;
|
for (tl = layer_id.temporal_layer_id;
|
||||||
tl < enc_cfg.ts_number_layers; ++tl) {
|
tl < enc_cfg.ts_number_layers; ++tl) {
|
||||||
vpx_video_writer_write_frame(outfile[tl],
|
vpx_video_writer_write_frame(
|
||||||
cx_pkt->data.frame.buf,
|
outfile[tl], cx_pkt->data.frame.buf, cx_pkt->data.frame.sz,
|
||||||
cx_pkt->data.frame.sz,
|
|
||||||
cx_pkt->data.frame.pts);
|
cx_pkt->data.frame.pts);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -860,14 +853,11 @@ int main(int argc, const char **argv) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case VPX_CODEC_STATS_PKT: {
|
case VPX_CODEC_STATS_PKT: {
|
||||||
stats_write(&app_input.rc_stats,
|
stats_write(&app_input.rc_stats, cx_pkt->data.twopass_stats.buf,
|
||||||
cx_pkt->data.twopass_stats.buf,
|
|
||||||
cx_pkt->data.twopass_stats.sz);
|
cx_pkt->data.twopass_stats.sz);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: { break; }
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -880,8 +870,8 @@ int main(int argc, const char **argv) {
|
|||||||
// Compensate for the extra frame count for the bypass mode.
|
// Compensate for the extra frame count for the bypass mode.
|
||||||
if (svc_ctx.temporal_layering_mode == VP9E_TEMPORAL_LAYERING_MODE_BYPASS) {
|
if (svc_ctx.temporal_layering_mode == VP9E_TEMPORAL_LAYERING_MODE_BYPASS) {
|
||||||
for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {
|
for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {
|
||||||
const int layer = sl * enc_cfg.ts_number_layers +
|
const int layer =
|
||||||
layer_id.temporal_layer_id;
|
sl * enc_cfg.ts_number_layers + layer_id.temporal_layer_id;
|
||||||
--rc.layer_input_frames[layer];
|
--rc.layer_input_frames[layer];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -895,8 +885,7 @@ int main(int argc, const char **argv) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec");
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec");
|
||||||
if (app_input.passes == 2)
|
if (app_input.passes == 2) stats_close(&app_input.rc_stats, 1);
|
||||||
stats_close(&app_input.rc_stats, 1);
|
|
||||||
if (writer) {
|
if (writer) {
|
||||||
vpx_video_writer_close(writer);
|
vpx_video_writer_close(writer);
|
||||||
}
|
}
|
||||||
@ -908,8 +897,7 @@ int main(int argc, const char **argv) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
||||||
frame_cnt,
|
frame_cnt, 1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
||||||
1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
|
||||||
1000000 * (double)frame_cnt / (double)cx_time);
|
1000000 * (double)frame_cnt / (double)cx_time);
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
// display average size, psnr
|
// display average size, psnr
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// VP9 Set Reference Frame
|
// VP9 Set Reference Frame
|
||||||
// ============================
|
// ============================
|
||||||
//
|
//
|
||||||
@ -61,7 +60,8 @@
|
|||||||
static const char *exec_name;
|
static const char *exec_name;
|
||||||
|
|
||||||
void usage_exit() {
|
void usage_exit() {
|
||||||
fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile> "
|
fprintf(stderr,
|
||||||
|
"Usage: %s <width> <height> <infile> <outfile> "
|
||||||
"<frame> <limit(optional)>\n",
|
"<frame> <limit(optional)>\n",
|
||||||
exec_name);
|
exec_name);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
@ -70,8 +70,7 @@ void usage_exit() {
|
|||||||
static int compare_img(const vpx_image_t *const img1,
|
static int compare_img(const vpx_image_t *const img1,
|
||||||
const vpx_image_t *const img2) {
|
const vpx_image_t *const img2) {
|
||||||
uint32_t l_w = img1->d_w;
|
uint32_t l_w = img1->d_w;
|
||||||
uint32_t c_w =
|
uint32_t c_w = (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||||
(img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
|
||||||
const uint32_t c_h =
|
const uint32_t c_h =
|
||||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
@ -101,8 +100,8 @@ static int compare_img(const vpx_image_t *const img1,
|
|||||||
|
|
||||||
#define mmin(a, b) ((a) < (b) ? (a) : (b))
|
#define mmin(a, b) ((a) < (b) ? (a) : (b))
|
||||||
static void find_mismatch(const vpx_image_t *const img1,
|
static void find_mismatch(const vpx_image_t *const img1,
|
||||||
const vpx_image_t *const img2,
|
const vpx_image_t *const img2, int yloc[4],
|
||||||
int yloc[4], int uloc[4], int vloc[4]) {
|
int uloc[4], int vloc[4]) {
|
||||||
const uint32_t bsize = 64;
|
const uint32_t bsize = 64;
|
||||||
const uint32_t bsizey = bsize >> img1->y_chroma_shift;
|
const uint32_t bsizey = bsize >> img1->y_chroma_shift;
|
||||||
const uint32_t bsizex = bsize >> img1->x_chroma_shift;
|
const uint32_t bsizex = bsize >> img1->x_chroma_shift;
|
||||||
@ -190,16 +189,13 @@ static void find_mismatch(const vpx_image_t *const img1,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void testing_decode(vpx_codec_ctx_t *encoder,
|
static void testing_decode(vpx_codec_ctx_t *encoder, vpx_codec_ctx_t *decoder,
|
||||||
vpx_codec_ctx_t *decoder,
|
vpx_codec_enc_cfg_t *cfg, unsigned int frame_out,
|
||||||
vpx_codec_enc_cfg_t *cfg,
|
|
||||||
unsigned int frame_out,
|
|
||||||
int *mismatch_seen) {
|
int *mismatch_seen) {
|
||||||
vpx_image_t enc_img, dec_img;
|
vpx_image_t enc_img, dec_img;
|
||||||
struct vp9_ref_frame ref_enc, ref_dec;
|
struct vp9_ref_frame ref_enc, ref_dec;
|
||||||
|
|
||||||
if (*mismatch_seen)
|
if (*mismatch_seen) return;
|
||||||
return;
|
|
||||||
|
|
||||||
ref_enc.idx = 0;
|
ref_enc.idx = 0;
|
||||||
ref_dec.idx = 0;
|
ref_dec.idx = 0;
|
||||||
@ -216,37 +212,31 @@ static void testing_decode(vpx_codec_ctx_t *encoder,
|
|||||||
*mismatch_seen = 1;
|
*mismatch_seen = 1;
|
||||||
|
|
||||||
find_mismatch(&enc_img, &dec_img, y, u, v);
|
find_mismatch(&enc_img, &dec_img, y, u, v);
|
||||||
printf("Encode/decode mismatch on frame %d at"
|
printf(
|
||||||
|
"Encode/decode mismatch on frame %d at"
|
||||||
" Y[%d, %d] {%d/%d},"
|
" Y[%d, %d] {%d/%d},"
|
||||||
" U[%d, %d] {%d/%d},"
|
" U[%d, %d] {%d/%d},"
|
||||||
" V[%d, %d] {%d/%d}",
|
" V[%d, %d] {%d/%d}",
|
||||||
frame_out,
|
frame_out, y[0], y[1], y[2], y[3], u[0], u[1], u[2], u[3], v[0], v[1],
|
||||||
y[0], y[1], y[2], y[3],
|
v[2], v[3]);
|
||||||
u[0], u[1], u[2], u[3],
|
|
||||||
v[0], v[1], v[2], v[3]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
vpx_img_free(&enc_img);
|
vpx_img_free(&enc_img);
|
||||||
vpx_img_free(&dec_img);
|
vpx_img_free(&dec_img);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(vpx_codec_ctx_t *ecodec,
|
static int encode_frame(vpx_codec_ctx_t *ecodec, vpx_codec_enc_cfg_t *cfg,
|
||||||
vpx_codec_enc_cfg_t *cfg,
|
vpx_image_t *img, unsigned int frame_in,
|
||||||
vpx_image_t *img,
|
VpxVideoWriter *writer, int test_decode,
|
||||||
unsigned int frame_in,
|
vpx_codec_ctx_t *dcodec, unsigned int *frame_out,
|
||||||
VpxVideoWriter *writer,
|
|
||||||
int test_decode,
|
|
||||||
vpx_codec_ctx_t *dcodec,
|
|
||||||
unsigned int *frame_out,
|
|
||||||
int *mismatch_seen) {
|
int *mismatch_seen) {
|
||||||
int got_pkts = 0;
|
int got_pkts = 0;
|
||||||
vpx_codec_iter_t iter = NULL;
|
vpx_codec_iter_t iter = NULL;
|
||||||
const vpx_codec_cx_pkt_t *pkt = NULL;
|
const vpx_codec_cx_pkt_t *pkt = NULL;
|
||||||
int got_data;
|
int got_data;
|
||||||
const vpx_codec_err_t res = vpx_codec_encode(ecodec, img, frame_in, 1,
|
const vpx_codec_err_t res =
|
||||||
0, VPX_DL_GOOD_QUALITY);
|
vpx_codec_encode(ecodec, img, frame_in, 1, 0, VPX_DL_GOOD_QUALITY);
|
||||||
if (res != VPX_CODEC_OK)
|
if (res != VPX_CODEC_OK) die_codec(ecodec, "Failed to encode frame");
|
||||||
die_codec(ecodec, "Failed to encode frame");
|
|
||||||
|
|
||||||
got_data = 0;
|
got_data = 0;
|
||||||
|
|
||||||
@ -260,8 +250,7 @@ static int encode_frame(vpx_codec_ctx_t *ecodec,
|
|||||||
*frame_out += 1;
|
*frame_out += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!vpx_video_writer_write_frame(writer,
|
if (!vpx_video_writer_write_frame(writer, pkt->data.frame.buf,
|
||||||
pkt->data.frame.buf,
|
|
||||||
pkt->data.frame.sz,
|
pkt->data.frame.sz,
|
||||||
pkt->data.frame.pts)) {
|
pkt->data.frame.pts)) {
|
||||||
die_codec(ecodec, "Failed to write compressed frame");
|
die_codec(ecodec, "Failed to write compressed frame");
|
||||||
@ -319,8 +308,7 @@ int main(int argc, char **argv) {
|
|||||||
unsigned int limit = 0;
|
unsigned int limit = 0;
|
||||||
exec_name = argv[0];
|
exec_name = argv[0];
|
||||||
|
|
||||||
if (argc < 6)
|
if (argc < 6) die("Invalid number of arguments");
|
||||||
die("Invalid number of arguments");
|
|
||||||
|
|
||||||
width_arg = argv[1];
|
width_arg = argv[1];
|
||||||
height_arg = argv[2];
|
height_arg = argv[2];
|
||||||
@ -328,15 +316,13 @@ int main(int argc, char **argv) {
|
|||||||
outfile_arg = argv[4];
|
outfile_arg = argv[4];
|
||||||
|
|
||||||
encoder = get_vpx_encoder_by_name("vp9");
|
encoder = get_vpx_encoder_by_name("vp9");
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
update_frame_num = atoi(argv[5]);
|
update_frame_num = atoi(argv[5]);
|
||||||
// In VP9, the reference buffers (cm->buffer_pool->frame_bufs[i].buf) are
|
// In VP9, the reference buffers (cm->buffer_pool->frame_bufs[i].buf) are
|
||||||
// allocated while calling vpx_codec_encode(), thus, setting reference for
|
// allocated while calling vpx_codec_encode(), thus, setting reference for
|
||||||
// 1st frame isn't supported.
|
// 1st frame isn't supported.
|
||||||
if (update_frame_num <= 1)
|
if (update_frame_num <= 1) die("Couldn't parse frame number '%s'\n", argv[5]);
|
||||||
die("Couldn't parse frame number '%s'\n", argv[5]);
|
|
||||||
|
|
||||||
if (argc > 6) {
|
if (argc > 6) {
|
||||||
limit = atoi(argv[6]);
|
limit = atoi(argv[6]);
|
||||||
@ -350,10 +336,8 @@ int main(int argc, char **argv) {
|
|||||||
info.time_base.numerator = 1;
|
info.time_base.numerator = 1;
|
||||||
info.time_base.denominator = fps;
|
info.time_base.denominator = fps;
|
||||||
|
|
||||||
if (info.frame_width <= 0 ||
|
if (info.frame_width <= 0 || info.frame_height <= 0 ||
|
||||||
info.frame_height <= 0 ||
|
(info.frame_width % 2) != 0 || (info.frame_height % 2) != 0) {
|
||||||
(info.frame_width % 2) != 0 ||
|
|
||||||
(info.frame_height % 2) != 0) {
|
|
||||||
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
die("Invalid frame size: %dx%d", info.frame_width, info.frame_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -365,8 +349,7 @@ int main(int argc, char **argv) {
|
|||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0);
|
||||||
if (res)
|
if (res) die_codec(&ecodec, "Failed to get default codec config.");
|
||||||
die_codec(&ecodec, "Failed to get default codec config.");
|
|
||||||
|
|
||||||
cfg.g_w = info.frame_width;
|
cfg.g_w = info.frame_width;
|
||||||
cfg.g_h = info.frame_height;
|
cfg.g_h = info.frame_height;
|
||||||
@ -376,8 +359,7 @@ int main(int argc, char **argv) {
|
|||||||
cfg.g_lag_in_frames = 3;
|
cfg.g_lag_in_frames = 3;
|
||||||
|
|
||||||
writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info);
|
writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info);
|
||||||
if (!writer)
|
if (!writer) die("Failed to open %s for writing.", outfile_arg);
|
||||||
die("Failed to open %s for writing.", outfile_arg);
|
|
||||||
|
|
||||||
if (!(infile = fopen(infile_arg, "rb")))
|
if (!(infile = fopen(infile_arg, "rb")))
|
||||||
die("Failed to open %s for reading.", infile_arg);
|
die("Failed to open %s for reading.", infile_arg);
|
||||||
@ -397,8 +379,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
// Encode frames.
|
// Encode frames.
|
||||||
while (vpx_img_read(&raw, infile)) {
|
while (vpx_img_read(&raw, infile)) {
|
||||||
if (limit && frame_in >= limit)
|
if (limit && frame_in >= limit) break;
|
||||||
break;
|
|
||||||
if (update_frame_num > 1 && frame_out + 1 == update_frame_num) {
|
if (update_frame_num > 1 && frame_out + 1 == update_frame_num) {
|
||||||
vpx_ref_frame_t ref;
|
vpx_ref_frame_t ref;
|
||||||
ref.frame_type = VP8_LAST_FRAME;
|
ref.frame_type = VP8_LAST_FRAME;
|
||||||
@ -416,17 +397,17 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
encode_frame(&ecodec, &cfg, &raw, frame_in, writer, test_decode,
|
encode_frame(&ecodec, &cfg, &raw, frame_in, writer, test_decode, &dcodec,
|
||||||
&dcodec, &frame_out, &mismatch_seen);
|
&frame_out, &mismatch_seen);
|
||||||
frame_in++;
|
frame_in++;
|
||||||
if (mismatch_seen)
|
if (mismatch_seen) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush encoder.
|
// Flush encoder.
|
||||||
if (!mismatch_seen)
|
if (!mismatch_seen)
|
||||||
while (encode_frame(&ecodec, &cfg, NULL, frame_in, writer, test_decode,
|
while (encode_frame(&ecodec, &cfg, NULL, frame_in, writer, test_decode,
|
||||||
&dcodec, &frame_out, &mismatch_seen)) {}
|
&dcodec, &frame_out, &mismatch_seen)) {
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
fclose(infile);
|
fclose(infile);
|
||||||
|
@ -28,9 +28,7 @@
|
|||||||
|
|
||||||
static const char *exec_name;
|
static const char *exec_name;
|
||||||
|
|
||||||
void usage_exit(void) {
|
void usage_exit(void) { exit(EXIT_FAILURE); }
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Denoiser states, for temporal denoising.
|
// Denoiser states, for temporal denoising.
|
||||||
enum denoiserState {
|
enum denoiserState {
|
||||||
@ -86,13 +84,13 @@ static void set_rate_control_metrics(struct RateControlMetrics *rc,
|
|||||||
// per-frame-bandwidth, for the rate control encoding stats below.
|
// per-frame-bandwidth, for the rate control encoding stats below.
|
||||||
const double framerate = cfg->g_timebase.den / cfg->g_timebase.num;
|
const double framerate = cfg->g_timebase.den / cfg->g_timebase.num;
|
||||||
rc->layer_framerate[0] = framerate / cfg->ts_rate_decimator[0];
|
rc->layer_framerate[0] = framerate / cfg->ts_rate_decimator[0];
|
||||||
rc->layer_pfb[0] = 1000.0 * rc->layer_target_bitrate[0] /
|
rc->layer_pfb[0] =
|
||||||
rc->layer_framerate[0];
|
1000.0 * rc->layer_target_bitrate[0] / rc->layer_framerate[0];
|
||||||
for (i = 0; i < cfg->ts_number_layers; ++i) {
|
for (i = 0; i < cfg->ts_number_layers; ++i) {
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
rc->layer_framerate[i] = framerate / cfg->ts_rate_decimator[i];
|
rc->layer_framerate[i] = framerate / cfg->ts_rate_decimator[i];
|
||||||
rc->layer_pfb[i] = 1000.0 *
|
rc->layer_pfb[i] = 1000.0 * (rc->layer_target_bitrate[i] -
|
||||||
(rc->layer_target_bitrate[i] - rc->layer_target_bitrate[i - 1]) /
|
rc->layer_target_bitrate[i - 1]) /
|
||||||
(rc->layer_framerate[i] - rc->layer_framerate[i - 1]);
|
(rc->layer_framerate[i] - rc->layer_framerate[i - 1]);
|
||||||
}
|
}
|
||||||
rc->layer_input_frames[i] = 0;
|
rc->layer_input_frames[i] = 0;
|
||||||
@ -118,25 +116,27 @@ static void printout_rate_control_summary(struct RateControlMetrics *rc,
|
|||||||
printf("Rate control layer stats for %d layer(s):\n\n",
|
printf("Rate control layer stats for %d layer(s):\n\n",
|
||||||
cfg->ts_number_layers);
|
cfg->ts_number_layers);
|
||||||
for (i = 0; i < cfg->ts_number_layers; ++i) {
|
for (i = 0; i < cfg->ts_number_layers; ++i) {
|
||||||
const int num_dropped = (i > 0) ?
|
const int num_dropped =
|
||||||
(rc->layer_input_frames[i] - rc->layer_enc_frames[i]) :
|
(i > 0) ? (rc->layer_input_frames[i] - rc->layer_enc_frames[i])
|
||||||
(rc->layer_input_frames[i] - rc->layer_enc_frames[i] - 1);
|
: (rc->layer_input_frames[i] - rc->layer_enc_frames[i] - 1);
|
||||||
tot_num_frames += rc->layer_input_frames[i];
|
tot_num_frames += rc->layer_input_frames[i];
|
||||||
rc->layer_encoding_bitrate[i] = 0.001 * rc->layer_framerate[i] *
|
rc->layer_encoding_bitrate[i] = 0.001 * rc->layer_framerate[i] *
|
||||||
rc->layer_encoding_bitrate[i] / tot_num_frames;
|
rc->layer_encoding_bitrate[i] /
|
||||||
rc->layer_avg_frame_size[i] = rc->layer_avg_frame_size[i] /
|
tot_num_frames;
|
||||||
rc->layer_enc_frames[i];
|
rc->layer_avg_frame_size[i] =
|
||||||
rc->layer_avg_rate_mismatch[i] = 100.0 * rc->layer_avg_rate_mismatch[i] /
|
rc->layer_avg_frame_size[i] / rc->layer_enc_frames[i];
|
||||||
rc->layer_enc_frames[i];
|
rc->layer_avg_rate_mismatch[i] =
|
||||||
|
100.0 * rc->layer_avg_rate_mismatch[i] / rc->layer_enc_frames[i];
|
||||||
printf("For layer#: %d \n", i);
|
printf("For layer#: %d \n", i);
|
||||||
printf("Bitrate (target vs actual): %d %f \n", rc->layer_target_bitrate[i],
|
printf("Bitrate (target vs actual): %d %f \n", rc->layer_target_bitrate[i],
|
||||||
rc->layer_encoding_bitrate[i]);
|
rc->layer_encoding_bitrate[i]);
|
||||||
printf("Average frame size (target vs actual): %f %f \n", rc->layer_pfb[i],
|
printf("Average frame size (target vs actual): %f %f \n", rc->layer_pfb[i],
|
||||||
rc->layer_avg_frame_size[i]);
|
rc->layer_avg_frame_size[i]);
|
||||||
printf("Average rate_mismatch: %f \n", rc->layer_avg_rate_mismatch[i]);
|
printf("Average rate_mismatch: %f \n", rc->layer_avg_rate_mismatch[i]);
|
||||||
printf("Number of input frames, encoded (non-key) frames, "
|
printf(
|
||||||
"and perc dropped frames: %d %d %f \n", rc->layer_input_frames[i],
|
"Number of input frames, encoded (non-key) frames, "
|
||||||
rc->layer_enc_frames[i],
|
"and perc dropped frames: %d %d %f \n",
|
||||||
|
rc->layer_input_frames[i], rc->layer_enc_frames[i],
|
||||||
100.0 * num_dropped / rc->layer_input_frames[i]);
|
100.0 * num_dropped / rc->layer_input_frames[i]);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
@ -148,8 +148,7 @@ static void printout_rate_control_summary(struct RateControlMetrics *rc,
|
|||||||
rc->avg_st_encoding_bitrate;
|
rc->avg_st_encoding_bitrate;
|
||||||
printf("Short-time stats, for window of %d frames: \n", rc->window_size);
|
printf("Short-time stats, for window of %d frames: \n", rc->window_size);
|
||||||
printf("Average, rms-variance, and percent-fluct: %f %f %f \n",
|
printf("Average, rms-variance, and percent-fluct: %f %f %f \n",
|
||||||
rc->avg_st_encoding_bitrate,
|
rc->avg_st_encoding_bitrate, sqrt(rc->variance_st_encoding_bitrate),
|
||||||
sqrt(rc->variance_st_encoding_bitrate),
|
|
||||||
perc_fluctuation);
|
perc_fluctuation);
|
||||||
if ((frame_cnt - 1) != tot_num_frames)
|
if ((frame_cnt - 1) != tot_num_frames)
|
||||||
die("Error: Number of input frames not equal to output! \n");
|
die("Error: Number of input frames not equal to output! \n");
|
||||||
@ -174,8 +173,8 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
cfg->ts_rate_decimator[0] = 1;
|
cfg->ts_rate_decimator[0] = 1;
|
||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// Update L only.
|
// Update L only.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[0] =
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 1: {
|
case 1: {
|
||||||
@ -190,13 +189,15 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
#if 1
|
#if 1
|
||||||
// 0=L, 1=GF, Intra-layer prediction enabled.
|
// 0=L, 1=GF, Intra-layer prediction enabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF;
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF |
|
||||||
layer_flags[1] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_REF_ARF;
|
VP8_EFLAG_NO_REF_ARF;
|
||||||
|
layer_flags[1] =
|
||||||
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_REF_ARF;
|
||||||
#else
|
#else
|
||||||
// 0=L, 1=GF, Intra-layer prediction disabled.
|
// 0=L, 1=GF, Intra-layer prediction disabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF;
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF |
|
||||||
|
VP8_EFLAG_NO_REF_ARF;
|
||||||
layer_flags[1] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
layer_flags[1] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_LAST;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_LAST;
|
||||||
#endif
|
#endif
|
||||||
@ -213,10 +214,11 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, Intra-layer prediction enabled.
|
// 0=L, 1=GF, Intra-layer prediction enabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
layer_flags[1] =
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
layer_flags[1] = layer_flags[2] =
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_ARF |
|
||||||
|
VP8_EFLAG_NO_UPD_LAST;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 3: {
|
case 3: {
|
||||||
@ -231,13 +233,12 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled.
|
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
layer_flags[3] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_ARF |
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
VP8_EFLAG_NO_UPD_LAST;
|
layer_flags[3] =
|
||||||
layer_flags[1] =
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
layer_flags[2] =
|
layer_flags[1] = layer_flags[2] = layer_flags[4] = layer_flags[5] =
|
||||||
layer_flags[4] =
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
layer_flags[5] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_LAST;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 4: {
|
case 4: {
|
||||||
@ -252,12 +253,13 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF, Intra-layer prediction disabled.
|
// 0=L, 1=GF, 2=ARF, Intra-layer prediction disabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
layer_flags[1] =
|
layer_flags[1] = layer_flags[3] =
|
||||||
layer_flags[3] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 5: {
|
case 5: {
|
||||||
@ -273,12 +275,13 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled in layer 1, disabled
|
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled in layer 1, disabled
|
||||||
// in layer 2.
|
// in layer 2.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
|
layer_flags[2] =
|
||||||
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
|
layer_flags[1] = layer_flags[3] =
|
||||||
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[1] =
|
|
||||||
layer_flags[3] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 6: {
|
case 6: {
|
||||||
@ -293,11 +296,12 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled.
|
// 0=L, 1=GF, 2=ARF, Intra-layer prediction enabled.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[1] =
|
layer_flags[2] =
|
||||||
layer_flags[3] = VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
|
layer_flags[1] = layer_flags[3] =
|
||||||
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 7: {
|
case 7: {
|
||||||
@ -314,21 +318,14 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
cfg->ts_rate_decimator[4] = 1;
|
cfg->ts_rate_decimator[4] = 1;
|
||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF;
|
layer_flags[0] = VPX_EFLAG_FORCE_KF;
|
||||||
layer_flags[1] =
|
layer_flags[1] = layer_flags[3] = layer_flags[5] = layer_flags[7] =
|
||||||
layer_flags[3] =
|
layer_flags[9] = layer_flags[11] = layer_flags[13] = layer_flags[15] =
|
||||||
layer_flags[5] =
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
||||||
layer_flags[7] =
|
|
||||||
layer_flags[9] =
|
|
||||||
layer_flags[11] =
|
|
||||||
layer_flags[13] =
|
|
||||||
layer_flags[15] = VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[2] =
|
layer_flags[2] = layer_flags[6] = layer_flags[10] = layer_flags[14] =
|
||||||
layer_flags[6] =
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_GF;
|
||||||
layer_flags[10] =
|
layer_flags[4] = layer_flags[12] =
|
||||||
layer_flags[14] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_GF;
|
VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[4] =
|
|
||||||
layer_flags[12] = VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_UPD_ARF;
|
|
||||||
layer_flags[8] = VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_REF_GF;
|
layer_flags[8] = VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_REF_GF;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -346,14 +343,14 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
// key frame. Sync point every 8 frames.
|
// key frame. Sync point every 8 frames.
|
||||||
|
|
||||||
// Layer 0: predict from L and ARF, update L and G.
|
// Layer 0: predict from L and ARF, update L and G.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] =
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
// Layer 1: sync point: predict from L and ARF, and update G.
|
// Layer 1: sync point: predict from L and ARF, and update G.
|
||||||
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_LAST |
|
layer_flags[1] =
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
// Layer 0, predict from L and ARF, update L.
|
// Layer 0, predict from L and ARF, update L.
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[2] =
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
// Layer 1: predict from L, G and ARF, and update G.
|
// Layer 1: predict from L, G and ARF, and update G.
|
||||||
layer_flags[3] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
layer_flags[3] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
@ -379,17 +376,18 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF.
|
// 0=L, 1=GF, 2=ARF.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_REF_GF |
|
||||||
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_GF |
|
||||||
|
VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
||||||
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
||||||
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[3] =
|
layer_flags[3] = layer_flags[5] =
|
||||||
layer_flags[5] = VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
|
||||||
layer_flags[4] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
layer_flags[4] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_ARF |
|
||||||
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[6] = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST |
|
layer_flags[6] =
|
||||||
VP8_EFLAG_NO_UPD_ARF;
|
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF;
|
||||||
layer_flags[7] = VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[7] = VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
break;
|
break;
|
||||||
@ -409,21 +407,21 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF.
|
// 0=L, 1=GF, 2=ARF.
|
||||||
// Layer 0: predict from L and ARF; update L and G.
|
// Layer 0: predict from L and ARF; update L and G.
|
||||||
layer_flags[0] = VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[0] =
|
||||||
VP8_EFLAG_NO_REF_GF;
|
VPX_EFLAG_FORCE_KF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF;
|
||||||
// Layer 2: sync point: predict from L and ARF; update none.
|
// Layer 2: sync point: predict from L and ARF; update none.
|
||||||
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF |
|
layer_flags[1] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
// Layer 1: sync point: predict from L and ARF; update G.
|
// Layer 1: sync point: predict from L and ARF; update G.
|
||||||
layer_flags[2] = VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[2] =
|
||||||
VP8_EFLAG_NO_UPD_LAST;
|
VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
// Layer 2: predict from L, G, ARF; update none.
|
// Layer 2: predict from L, G, ARF; update none.
|
||||||
layer_flags[3] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[3] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF |
|
||||||
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ENTROPY;
|
VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ENTROPY;
|
||||||
// Layer 0: predict from L and ARF; update L.
|
// Layer 0: predict from L and ARF; update L.
|
||||||
layer_flags[4] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[4] =
|
||||||
VP8_EFLAG_NO_REF_GF;
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF;
|
||||||
// Layer 2: predict from L, G, ARF; update none.
|
// Layer 2: predict from L, G, ARF; update none.
|
||||||
layer_flags[5] = layer_flags[3];
|
layer_flags[5] = layer_flags[3];
|
||||||
// Layer 1: predict from L, G, ARF; update G.
|
// Layer 1: predict from L, G, ARF; update G.
|
||||||
@ -471,8 +469,8 @@ static void set_temporal_layer_pattern(int layering_mode,
|
|||||||
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
memcpy(cfg->ts_layer_id, ids, sizeof(ids));
|
||||||
// 0=L, 1=GF, 2=ARF.
|
// 0=L, 1=GF, 2=ARF.
|
||||||
// Layer 0: predict from L and ARF; update L.
|
// Layer 0: predict from L and ARF; update L.
|
||||||
layer_flags[0] = VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF |
|
layer_flags[0] =
|
||||||
VP8_EFLAG_NO_REF_GF;
|
VP8_EFLAG_NO_UPD_GF | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_GF;
|
||||||
layer_flags[4] = layer_flags[0];
|
layer_flags[4] = layer_flags[0];
|
||||||
// Layer 1: predict from L, G, ARF; update G.
|
// Layer 1: predict from L, G, ARF; update G.
|
||||||
layer_flags[2] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
layer_flags[2] = VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
|
||||||
@ -532,19 +530,22 @@ int main(int argc, char **argv) {
|
|||||||
// Check usage and arguments.
|
// Check usage and arguments.
|
||||||
if (argc < min_args) {
|
if (argc < min_args) {
|
||||||
#if CONFIG_VP9_HIGHBITDEPTH
|
#if CONFIG_VP9_HIGHBITDEPTH
|
||||||
die("Usage: %s <infile> <outfile> <codec_type(vp8/vp9)> <width> <height> "
|
die(
|
||||||
|
"Usage: %s <infile> <outfile> <codec_type(vp8/vp9)> <width> <height> "
|
||||||
"<rate_num> <rate_den> <speed> <frame_drop_threshold> <mode> "
|
"<rate_num> <rate_den> <speed> <frame_drop_threshold> <mode> "
|
||||||
"<Rate_0> ... <Rate_nlayers-1> <bit-depth> \n", argv[0]);
|
"<Rate_0> ... <Rate_nlayers-1> <bit-depth> \n",
|
||||||
|
argv[0]);
|
||||||
#else
|
#else
|
||||||
die("Usage: %s <infile> <outfile> <codec_type(vp8/vp9)> <width> <height> "
|
die(
|
||||||
|
"Usage: %s <infile> <outfile> <codec_type(vp8/vp9)> <width> <height> "
|
||||||
"<rate_num> <rate_den> <speed> <frame_drop_threshold> <mode> "
|
"<rate_num> <rate_den> <speed> <frame_drop_threshold> <mode> "
|
||||||
"<Rate_0> ... <Rate_nlayers-1> \n", argv[0]);
|
"<Rate_0> ... <Rate_nlayers-1> \n",
|
||||||
|
argv[0]);
|
||||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||||
}
|
}
|
||||||
|
|
||||||
encoder = get_vpx_encoder_by_name(argv[3]);
|
encoder = get_vpx_encoder_by_name(argv[3]);
|
||||||
if (!encoder)
|
if (!encoder) die("Unsupported codec.");
|
||||||
die("Unsupported codec.");
|
|
||||||
|
|
||||||
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface()));
|
||||||
|
|
||||||
@ -577,12 +578,10 @@ int main(int argc, char **argv) {
|
|||||||
bit_depth = VPX_BITS_12;
|
bit_depth = VPX_BITS_12;
|
||||||
input_bit_depth = 12;
|
input_bit_depth = 12;
|
||||||
break;
|
break;
|
||||||
default:
|
default: die("Invalid bit depth (8, 10, 12) %s", argv[argc - 1]);
|
||||||
die("Invalid bit depth (8, 10, 12) %s", argv[argc-1]);
|
|
||||||
}
|
}
|
||||||
if (!vpx_img_alloc(&raw,
|
if (!vpx_img_alloc(
|
||||||
bit_depth == VPX_BITS_8 ? VPX_IMG_FMT_I420 :
|
&raw, bit_depth == VPX_BITS_8 ? VPX_IMG_FMT_I420 : VPX_IMG_FMT_I42016,
|
||||||
VPX_IMG_FMT_I42016,
|
|
||||||
width, height, 32)) {
|
width, height, 32)) {
|
||||||
die("Failed to allocate image", width, height);
|
die("Failed to allocate image", width, height);
|
||||||
}
|
}
|
||||||
@ -621,8 +620,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = min_args_base;
|
for (i = min_args_base;
|
||||||
(int)i < min_args_base + mode_to_num_layers[layering_mode];
|
(int)i < min_args_base + mode_to_num_layers[layering_mode]; ++i) {
|
||||||
++i) {
|
|
||||||
rc.layer_target_bitrate[i - 11] = strtol(argv[i], NULL, 0);
|
rc.layer_target_bitrate[i - 11] = strtol(argv[i], NULL, 0);
|
||||||
if (strncmp(encoder->name, "vp8", 3) == 0)
|
if (strncmp(encoder->name, "vp8", 3) == 0)
|
||||||
cfg.ts_target_bitrate[i - 11] = rc.layer_target_bitrate[i - 11];
|
cfg.ts_target_bitrate[i - 11] = rc.layer_target_bitrate[i - 11];
|
||||||
@ -635,8 +633,7 @@ int main(int argc, char **argv) {
|
|||||||
cfg.rc_end_usage = VPX_CBR;
|
cfg.rc_end_usage = VPX_CBR;
|
||||||
cfg.rc_min_quantizer = 2;
|
cfg.rc_min_quantizer = 2;
|
||||||
cfg.rc_max_quantizer = 56;
|
cfg.rc_max_quantizer = 56;
|
||||||
if (strncmp(encoder->name, "vp9", 3) == 0)
|
if (strncmp(encoder->name, "vp9", 3) == 0) cfg.rc_max_quantizer = 52;
|
||||||
cfg.rc_max_quantizer = 52;
|
|
||||||
cfg.rc_undershoot_pct = 50;
|
cfg.rc_undershoot_pct = 50;
|
||||||
cfg.rc_overshoot_pct = 50;
|
cfg.rc_overshoot_pct = 50;
|
||||||
cfg.rc_buf_initial_sz = 500;
|
cfg.rc_buf_initial_sz = 500;
|
||||||
@ -659,9 +656,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
cfg.temporal_layering_mode = VP9E_TEMPORAL_LAYERING_MODE_BYPASS;
|
cfg.temporal_layering_mode = VP9E_TEMPORAL_LAYERING_MODE_BYPASS;
|
||||||
|
|
||||||
set_temporal_layer_pattern(layering_mode,
|
set_temporal_layer_pattern(layering_mode, &cfg, layer_flags,
|
||||||
&cfg,
|
|
||||||
layer_flags,
|
|
||||||
&flag_periodicity);
|
&flag_periodicity);
|
||||||
|
|
||||||
set_rate_control_metrics(&rc, &cfg);
|
set_rate_control_metrics(&rc, &cfg);
|
||||||
@ -688,8 +683,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
snprintf(file_name, sizeof(file_name), "%s_%d.ivf", argv[2], i);
|
snprintf(file_name, sizeof(file_name), "%s_%d.ivf", argv[2], i);
|
||||||
outfile[i] = vpx_video_writer_open(file_name, kContainerIVF, &info);
|
outfile[i] = vpx_video_writer_open(file_name, kContainerIVF, &info);
|
||||||
if (!outfile[i])
|
if (!outfile[i]) die("Failed to open %s for writing", file_name);
|
||||||
die("Failed to open %s for writing", file_name);
|
|
||||||
|
|
||||||
assert(outfile[i] != NULL);
|
assert(outfile[i] != NULL);
|
||||||
}
|
}
|
||||||
@ -760,11 +754,9 @@ int main(int argc, char **argv) {
|
|||||||
layer_id.temporal_layer_id);
|
layer_id.temporal_layer_id);
|
||||||
}
|
}
|
||||||
flags = layer_flags[frame_cnt % flag_periodicity];
|
flags = layer_flags[frame_cnt % flag_periodicity];
|
||||||
if (layering_mode == 0)
|
if (layering_mode == 0) flags = 0;
|
||||||
flags = 0;
|
|
||||||
frame_avail = vpx_img_read(&raw, infile);
|
frame_avail = vpx_img_read(&raw, infile);
|
||||||
if (frame_avail)
|
if (frame_avail) ++rc.layer_input_frames[layer_id.temporal_layer_id];
|
||||||
++rc.layer_input_frames[layer_id.temporal_layer_id];
|
|
||||||
vpx_usec_timer_start(&timer);
|
vpx_usec_timer_start(&timer);
|
||||||
if (vpx_codec_encode(&codec, frame_avail ? &raw : NULL, pts, 1, flags,
|
if (vpx_codec_encode(&codec, frame_avail ? &raw : NULL, pts, 1, flags,
|
||||||
VPX_DL_REALTIME)) {
|
VPX_DL_REALTIME)) {
|
||||||
@ -825,8 +817,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default: break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
++frame_cnt;
|
++frame_cnt;
|
||||||
@ -836,16 +827,13 @@ int main(int argc, char **argv) {
|
|||||||
printout_rate_control_summary(&rc, &cfg, frame_cnt);
|
printout_rate_control_summary(&rc, &cfg, frame_cnt);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
printf("Frame cnt and encoding time/FPS stats for encoding: %d %f %f \n",
|
||||||
frame_cnt,
|
frame_cnt, 1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
||||||
1000 * (float)cx_time / (double)(frame_cnt * 1000000),
|
|
||||||
1000000 * (double)frame_cnt / (double)cx_time);
|
1000000 * (double)frame_cnt / (double)cx_time);
|
||||||
|
|
||||||
if (vpx_codec_destroy(&codec))
|
if (vpx_codec_destroy(&codec)) die_codec(&codec, "Failed to destroy codec");
|
||||||
die_codec(&codec, "Failed to destroy codec");
|
|
||||||
|
|
||||||
// Try to rewrite the output file headers with the actual frame count.
|
// Try to rewrite the output file headers with the actual frame count.
|
||||||
for (i = 0; i < cfg.ts_number_layers; ++i)
|
for (i = 0; i < cfg.ts_number_layers; ++i) vpx_video_writer_close(outfile[i]);
|
||||||
vpx_video_writer_close(outfile[i]);
|
|
||||||
|
|
||||||
vpx_img_free(&raw);
|
vpx_img_free(&raw);
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user