top-level: apply clang-format
Change-Id: Iac1d97d84518649404e32b136b8fdd840723303c
This commit is contained in:
Родитель
397d964f29
Коммит
6c4d83ec9e
116
args.c
116
args.c
|
@ -8,7 +8,6 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
@ -22,42 +21,36 @@ extern void die(const char *fmt, ...) __attribute__((noreturn));
|
|||
extern void die(const char *fmt, ...);
|
||||
#endif
|
||||
|
||||
|
||||
struct arg arg_init(char **argv) {
|
||||
struct arg a;
|
||||
|
||||
a.argv = argv;
|
||||
a.argv = argv;
|
||||
a.argv_step = 1;
|
||||
a.name = NULL;
|
||||
a.val = NULL;
|
||||
a.def = NULL;
|
||||
a.name = NULL;
|
||||
a.val = NULL;
|
||||
a.def = NULL;
|
||||
return a;
|
||||
}
|
||||
|
||||
int arg_match(struct arg *arg_, const struct arg_def *def, char **argv) {
|
||||
struct arg arg;
|
||||
|
||||
if (!argv[0] || argv[0][0] != '-')
|
||||
return 0;
|
||||
if (!argv[0] || argv[0][0] != '-') return 0;
|
||||
|
||||
arg = arg_init(argv);
|
||||
|
||||
if (def->short_name
|
||||
&& strlen(arg.argv[0]) == strlen(def->short_name) + 1
|
||||
&& !strcmp(arg.argv[0] + 1, def->short_name)) {
|
||||
|
||||
if (def->short_name && strlen(arg.argv[0]) == strlen(def->short_name) + 1 &&
|
||||
!strcmp(arg.argv[0] + 1, def->short_name)) {
|
||||
arg.name = arg.argv[0] + 1;
|
||||
arg.val = def->has_val ? arg.argv[1] : NULL;
|
||||
arg.argv_step = def->has_val ? 2 : 1;
|
||||
} else if (def->long_name) {
|
||||
const size_t name_len = strlen(def->long_name);
|
||||
|
||||
if (strlen(arg.argv[0]) >= name_len + 2
|
||||
&& arg.argv[0][1] == '-'
|
||||
&& !strncmp(arg.argv[0] + 2, def->long_name, name_len)
|
||||
&& (arg.argv[0][name_len + 2] == '='
|
||||
|| arg.argv[0][name_len + 2] == '\0')) {
|
||||
|
||||
if (strlen(arg.argv[0]) >= name_len + 2 && arg.argv[0][1] == '-' &&
|
||||
!strncmp(arg.argv[0] + 2, def->long_name, name_len) &&
|
||||
(arg.argv[0][name_len + 2] == '=' ||
|
||||
arg.argv[0][name_len + 2] == '\0')) {
|
||||
arg.name = arg.argv[0] + 2;
|
||||
arg.val = arg.name[name_len] == '=' ? arg.name + name_len + 1 : NULL;
|
||||
arg.argv_step = 1;
|
||||
|
@ -70,8 +63,7 @@ int arg_match(struct arg *arg_, const struct arg_def *def, char **argv) {
|
|||
if (arg.name && arg.val && !def->has_val)
|
||||
die("Error: option %s requires no argument.\n", arg.name);
|
||||
|
||||
if (arg.name
|
||||
&& (arg.val || !def->has_val)) {
|
||||
if (arg.name && (arg.val || !def->has_val)) {
|
||||
arg.def = def;
|
||||
*arg_ = arg;
|
||||
return 1;
|
||||
|
@ -80,15 +72,12 @@ int arg_match(struct arg *arg_, const struct arg_def *def, char **argv) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
const char *arg_next(struct arg *arg) {
|
||||
if (arg->argv[0])
|
||||
arg->argv += arg->argv_step;
|
||||
if (arg->argv[0]) arg->argv += arg->argv_step;
|
||||
|
||||
return *arg->argv;
|
||||
}
|
||||
|
||||
|
||||
char **argv_dup(int argc, const char **argv) {
|
||||
char **new_argv = malloc((argc + 1) * sizeof(*argv));
|
||||
|
||||
|
@ -97,9 +86,8 @@ char **argv_dup(int argc, const char **argv) {
|
|||
return new_argv;
|
||||
}
|
||||
|
||||
|
||||
void arg_show_usage(FILE *fp, const struct arg_def *const *defs) {
|
||||
char option_text[40] = {0};
|
||||
char option_text[40] = { 0 };
|
||||
|
||||
for (; *defs; defs++) {
|
||||
const struct arg_def *def = *defs;
|
||||
|
@ -109,15 +97,12 @@ void arg_show_usage(FILE *fp, const struct arg_def *const *defs) {
|
|||
if (def->short_name && def->long_name) {
|
||||
char *comma = def->has_val ? "," : ", ";
|
||||
|
||||
snprintf(option_text, 37, "-%s%s%s --%s%6s",
|
||||
def->short_name, short_val, comma,
|
||||
def->long_name, long_val);
|
||||
snprintf(option_text, 37, "-%s%s%s --%s%6s", def->short_name, short_val,
|
||||
comma, def->long_name, long_val);
|
||||
} else if (def->short_name)
|
||||
snprintf(option_text, 37, "-%s%s",
|
||||
def->short_name, short_val);
|
||||
snprintf(option_text, 37, "-%s%s", def->short_name, short_val);
|
||||
else if (def->long_name)
|
||||
snprintf(option_text, 37, " --%s%s",
|
||||
def->long_name, long_val);
|
||||
snprintf(option_text, 37, " --%s%s", def->long_name, long_val);
|
||||
|
||||
fprintf(fp, " %-37s\t%s\n", option_text, def->desc);
|
||||
|
||||
|
@ -127,59 +112,53 @@ void arg_show_usage(FILE *fp, const struct arg_def *const *defs) {
|
|||
fprintf(fp, " %-37s\t ", "");
|
||||
|
||||
for (listptr = def->enums; listptr->name; listptr++)
|
||||
fprintf(fp, "%s%s", listptr->name,
|
||||
listptr[1].name ? ", " : "\n");
|
||||
fprintf(fp, "%s%s", listptr->name, listptr[1].name ? ", " : "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
unsigned int arg_parse_uint(const struct arg *arg) {
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
|
||||
rawval = strtol(arg->val, &endptr, 10);
|
||||
|
||||
if (arg->val[0] != '\0' && endptr[0] == '\0') {
|
||||
if (rawval >= 0 && rawval <= UINT_MAX)
|
||||
return rawval;
|
||||
if (rawval >= 0 && rawval <= UINT_MAX) return rawval;
|
||||
|
||||
die("Option %s: Value %ld out of range for unsigned int\n",
|
||||
arg->name, rawval);
|
||||
die("Option %s: Value %ld out of range for unsigned int\n", arg->name,
|
||||
rawval);
|
||||
}
|
||||
|
||||
die("Option %s: Invalid character '%c'\n", arg->name, *endptr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int arg_parse_int(const struct arg *arg) {
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
|
||||
rawval = strtol(arg->val, &endptr, 10);
|
||||
|
||||
if (arg->val[0] != '\0' && endptr[0] == '\0') {
|
||||
if (rawval >= INT_MIN && rawval <= INT_MAX)
|
||||
return rawval;
|
||||
if (rawval >= INT_MIN && rawval <= INT_MAX) return rawval;
|
||||
|
||||
die("Option %s: Value %ld out of range for signed int\n",
|
||||
arg->name, rawval);
|
||||
die("Option %s: Value %ld out of range for signed int\n", arg->name,
|
||||
rawval);
|
||||
}
|
||||
|
||||
die("Option %s: Invalid character '%c'\n", arg->name, *endptr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
struct vpx_rational {
|
||||
int num; /**< fraction numerator */
|
||||
int den; /**< fraction denominator */
|
||||
};
|
||||
struct vpx_rational arg_parse_rational(const struct arg *arg) {
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
struct vpx_rational rat;
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
struct vpx_rational rat;
|
||||
|
||||
/* parse numerator */
|
||||
rawval = strtol(arg->val, &endptr, 10);
|
||||
|
@ -187,9 +166,11 @@ struct vpx_rational arg_parse_rational(const struct arg *arg) {
|
|||
if (arg->val[0] != '\0' && endptr[0] == '/') {
|
||||
if (rawval >= INT_MIN && rawval <= INT_MAX)
|
||||
rat.num = rawval;
|
||||
else die("Option %s: Value %ld out of range for signed int\n",
|
||||
arg->name, rawval);
|
||||
} else die("Option %s: Expected / at '%c'\n", arg->name, *endptr);
|
||||
else
|
||||
die("Option %s: Value %ld out of range for signed int\n", arg->name,
|
||||
rawval);
|
||||
} else
|
||||
die("Option %s: Expected / at '%c'\n", arg->name, *endptr);
|
||||
|
||||
/* parse denominator */
|
||||
rawval = strtol(endptr + 1, &endptr, 10);
|
||||
|
@ -197,40 +178,37 @@ struct vpx_rational arg_parse_rational(const struct arg *arg) {
|
|||
if (arg->val[0] != '\0' && endptr[0] == '\0') {
|
||||
if (rawval >= INT_MIN && rawval <= INT_MAX)
|
||||
rat.den = rawval;
|
||||
else die("Option %s: Value %ld out of range for signed int\n",
|
||||
arg->name, rawval);
|
||||
} else die("Option %s: Invalid character '%c'\n", arg->name, *endptr);
|
||||
else
|
||||
die("Option %s: Value %ld out of range for signed int\n", arg->name,
|
||||
rawval);
|
||||
} else
|
||||
die("Option %s: Invalid character '%c'\n", arg->name, *endptr);
|
||||
|
||||
return rat;
|
||||
}
|
||||
|
||||
|
||||
int arg_parse_enum(const struct arg *arg) {
|
||||
const struct arg_enum_list *listptr;
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
long int rawval;
|
||||
char *endptr;
|
||||
|
||||
/* First see if the value can be parsed as a raw value */
|
||||
rawval = strtol(arg->val, &endptr, 10);
|
||||
if (arg->val[0] != '\0' && endptr[0] == '\0') {
|
||||
/* Got a raw value, make sure it's valid */
|
||||
for (listptr = arg->def->enums; listptr->name; listptr++)
|
||||
if (listptr->val == rawval)
|
||||
return rawval;
|
||||
if (listptr->val == rawval) return rawval;
|
||||
}
|
||||
|
||||
/* Next see if it can be parsed as a string */
|
||||
for (listptr = arg->def->enums; listptr->name; listptr++)
|
||||
if (!strcmp(arg->val, listptr->name))
|
||||
return listptr->val;
|
||||
if (!strcmp(arg->val, listptr->name)) return listptr->val;
|
||||
|
||||
die("Option %s: Invalid value '%s'\n", arg->name, arg->val);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int arg_parse_enum_or_int(const struct arg *arg) {
|
||||
if (arg->def->enums)
|
||||
return arg_parse_enum(arg);
|
||||
if (arg->def->enums) return arg_parse_enum(arg);
|
||||
return arg_parse_int(arg);
|
||||
}
|
||||
|
|
27
args.h
27
args.h
|
@ -8,7 +8,6 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef ARGS_H_
|
||||
#define ARGS_H_
|
||||
#include <stdio.h>
|
||||
|
@ -18,29 +17,33 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
struct arg {
|
||||
char **argv;
|
||||
const char *name;
|
||||
const char *val;
|
||||
unsigned int argv_step;
|
||||
const struct arg_def *def;
|
||||
char **argv;
|
||||
const char *name;
|
||||
const char *val;
|
||||
unsigned int argv_step;
|
||||
const struct arg_def *def;
|
||||
};
|
||||
|
||||
struct arg_enum_list {
|
||||
const char *name;
|
||||
int val;
|
||||
int val;
|
||||
};
|
||||
#define ARG_ENUM_LIST_END {0}
|
||||
#define ARG_ENUM_LIST_END \
|
||||
{ 0 }
|
||||
|
||||
typedef struct arg_def {
|
||||
const char *short_name;
|
||||
const char *long_name;
|
||||
int has_val;
|
||||
int has_val;
|
||||
const char *desc;
|
||||
const struct arg_enum_list *enums;
|
||||
} arg_def_t;
|
||||
#define ARG_DEF(s,l,v,d) {s,l,v,d, NULL}
|
||||
#define ARG_DEF_ENUM(s,l,v,d,e) {s,l,v,d,e}
|
||||
#define ARG_DEF_LIST_END {0}
|
||||
#define ARG_DEF(s, l, v, d) \
|
||||
{ s, l, v, d, NULL }
|
||||
#define ARG_DEF_ENUM(s, l, v, d, e) \
|
||||
{ s, l, v, d, e }
|
||||
#define ARG_DEF_LIST_END \
|
||||
{ 0 }
|
||||
|
||||
struct arg arg_init(char **argv);
|
||||
int arg_match(struct arg *arg_, const struct arg_def *def, char **argv);
|
||||
|
|
12
ivfdec.c
12
ivfdec.c
|
@ -46,7 +46,8 @@ int file_is_ivf(struct VpxInputContext *input_ctx) {
|
|||
is_ivf = 1;
|
||||
|
||||
if (mem_get_le16(raw_hdr + 4) != 0) {
|
||||
fprintf(stderr, "Error: Unrecognized IVF version! This file may not"
|
||||
fprintf(stderr,
|
||||
"Error: Unrecognized IVF version! This file may not"
|
||||
" decode properly.");
|
||||
}
|
||||
|
||||
|
@ -69,14 +70,13 @@ int file_is_ivf(struct VpxInputContext *input_ctx) {
|
|||
return is_ivf;
|
||||
}
|
||||
|
||||
int ivf_read_frame(FILE *infile, uint8_t **buffer,
|
||||
size_t *bytes_read, size_t *buffer_size) {
|
||||
char raw_header[IVF_FRAME_HDR_SZ] = {0};
|
||||
int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
size_t *buffer_size) {
|
||||
char raw_header[IVF_FRAME_HDR_SZ] = { 0 };
|
||||
size_t frame_size = 0;
|
||||
|
||||
if (fread(raw_header, IVF_FRAME_HDR_SZ, 1, infile) != 1) {
|
||||
if (!feof(infile))
|
||||
warn("Failed to read frame size\n");
|
||||
if (!feof(infile)) warn("Failed to read frame size\n");
|
||||
} else {
|
||||
frame_size = mem_get_le32(raw_header);
|
||||
|
||||
|
|
6
ivfdec.h
6
ivfdec.h
|
@ -18,11 +18,11 @@ extern "C" {
|
|||
|
||||
int file_is_ivf(struct VpxInputContext *input);
|
||||
|
||||
int ivf_read_frame(FILE *infile, uint8_t **buffer,
|
||||
size_t *bytes_read, size_t *buffer_size);
|
||||
int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
size_t *buffer_size);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif // IVFDEC_H_
|
||||
|
|
6
ivfenc.c
6
ivfenc.c
|
@ -13,10 +13,8 @@
|
|||
#include "vpx/vpx_encoder.h"
|
||||
#include "vpx_ports/mem_ops.h"
|
||||
|
||||
void ivf_write_file_header(FILE *outfile,
|
||||
const struct vpx_codec_enc_cfg *cfg,
|
||||
unsigned int fourcc,
|
||||
int frame_cnt) {
|
||||
void ivf_write_file_header(FILE *outfile, const struct vpx_codec_enc_cfg *cfg,
|
||||
unsigned int fourcc, int frame_cnt) {
|
||||
char header[32];
|
||||
|
||||
header[0] = 'D';
|
||||
|
|
8
ivfenc.h
8
ivfenc.h
|
@ -19,17 +19,15 @@ struct vpx_codec_cx_pkt;
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
void ivf_write_file_header(FILE *outfile,
|
||||
const struct vpx_codec_enc_cfg *cfg,
|
||||
uint32_t fourcc,
|
||||
int frame_cnt);
|
||||
void ivf_write_file_header(FILE *outfile, const struct vpx_codec_enc_cfg *cfg,
|
||||
uint32_t fourcc, int frame_cnt);
|
||||
|
||||
void ivf_write_frame_header(FILE *outfile, int64_t pts, size_t frame_size);
|
||||
|
||||
void ivf_write_frame_size(FILE *outfile, size_t frame_size);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif // IVFENC_H_
|
||||
|
|
31
md5_utils.c
31
md5_utils.c
|
@ -20,19 +20,17 @@
|
|||
* Still in the public domain.
|
||||
*/
|
||||
|
||||
#include <string.h> /* for memcpy() */
|
||||
#include <string.h> /* for memcpy() */
|
||||
|
||||
#include "md5_utils.h"
|
||||
|
||||
static void
|
||||
byteSwap(UWORD32 *buf, unsigned words) {
|
||||
static void byteSwap(UWORD32 *buf, unsigned words) {
|
||||
md5byte *p;
|
||||
|
||||
/* Only swap bytes for big endian machines */
|
||||
int i = 1;
|
||||
|
||||
if (*(char *)&i == 1)
|
||||
return;
|
||||
if (*(char *)&i == 1) return;
|
||||
|
||||
p = (md5byte *)buf;
|
||||
|
||||
|
@ -47,8 +45,7 @@ byteSwap(UWORD32 *buf, unsigned words) {
|
|||
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
|
||||
* initialization constants.
|
||||
*/
|
||||
void
|
||||
MD5Init(struct MD5Context *ctx) {
|
||||
void MD5Init(struct MD5Context *ctx) {
|
||||
ctx->buf[0] = 0x67452301;
|
||||
ctx->buf[1] = 0xefcdab89;
|
||||
ctx->buf[2] = 0x98badcfe;
|
||||
|
@ -62,8 +59,7 @@ MD5Init(struct MD5Context *ctx) {
|
|||
* Update context to reflect the concatenation of another buffer full
|
||||
* of bytes.
|
||||
*/
|
||||
void
|
||||
MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len) {
|
||||
void MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len) {
|
||||
UWORD32 t;
|
||||
|
||||
/* Update byte count */
|
||||
|
@ -71,9 +67,9 @@ MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len) {
|
|||
t = ctx->bytes[0];
|
||||
|
||||
if ((ctx->bytes[0] = t + len) < t)
|
||||
ctx->bytes[1]++; /* Carry from low to high */
|
||||
ctx->bytes[1]++; /* Carry from low to high */
|
||||
|
||||
t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */
|
||||
t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */
|
||||
|
||||
if (t > len) {
|
||||
memcpy((md5byte *)ctx->in + 64 - t, buf, len);
|
||||
|
@ -104,8 +100,7 @@ MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len) {
|
|||
* Final wrapup - pad to 64-byte boundary with the bit pattern
|
||||
* 1 0* (64-bit count of bits processed, MSB-first)
|
||||
*/
|
||||
void
|
||||
MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
||||
void MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
||||
int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */
|
||||
md5byte *p = (md5byte *)ctx->in + count;
|
||||
|
||||
|
@ -115,7 +110,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
|||
/* Bytes of padding needed to make 56 bytes (-8..55) */
|
||||
count = 56 - 1 - count;
|
||||
|
||||
if (count < 0) { /* Padding forces an extra block */
|
||||
if (count < 0) { /* Padding forces an extra block */
|
||||
memset(p, 0, count + 8);
|
||||
byteSwap(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, ctx->in);
|
||||
|
@ -147,8 +142,8 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
|||
#define F4(x, y, z) (y ^ (x | ~z))
|
||||
|
||||
/* This is the central step in the MD5 algorithm. */
|
||||
#define MD5STEP(f,w,x,y,z,in,s) \
|
||||
(w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
|
||||
#define MD5STEP(f, w, x, y, z, in, s) \
|
||||
(w += f(x, y, z) + in, w = (w << s | w >> (32 - s)) + x)
|
||||
|
||||
#if defined(__clang__) && defined(__has_attribute)
|
||||
#if __has_attribute(no_sanitize)
|
||||
|
@ -166,8 +161,8 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) {
|
|||
* reflect the addition of 16 longwords of new data. MD5Update blocks
|
||||
* the data and converts bytes into longwords for this routine.
|
||||
*/
|
||||
VPX_NO_UNSIGNED_OVERFLOW_CHECK void
|
||||
MD5Transform(UWORD32 buf[4], UWORD32 const in[16]) {
|
||||
VPX_NO_UNSIGNED_OVERFLOW_CHECK void MD5Transform(UWORD32 buf[4],
|
||||
UWORD32 const in[16]) {
|
||||
register UWORD32 a, b, c, d;
|
||||
|
||||
a = buf[0];
|
||||
|
|
61
rate_hist.c
61
rate_hist.c
|
@ -45,8 +45,7 @@ struct rate_hist *init_rate_histogram(const vpx_codec_enc_cfg_t *cfg,
|
|||
hist->samples = cfg->rc_buf_sz * 5 / 4 * fps->num / fps->den / 1000;
|
||||
|
||||
// prevent division by zero
|
||||
if (hist->samples == 0)
|
||||
hist->samples = 1;
|
||||
if (hist->samples == 0) hist->samples = 1;
|
||||
|
||||
hist->frames = 0;
|
||||
hist->total = 0;
|
||||
|
@ -78,18 +77,16 @@ void update_rate_histogram(struct rate_hist *hist,
|
|||
int64_t avg_bitrate = 0;
|
||||
int64_t sum_sz = 0;
|
||||
const int64_t now = pkt->data.frame.pts * 1000 *
|
||||
(uint64_t)cfg->g_timebase.num /
|
||||
(uint64_t)cfg->g_timebase.den;
|
||||
(uint64_t)cfg->g_timebase.num /
|
||||
(uint64_t)cfg->g_timebase.den;
|
||||
|
||||
int idx = hist->frames++ % hist->samples;
|
||||
hist->pts[idx] = now;
|
||||
hist->sz[idx] = (int)pkt->data.frame.sz;
|
||||
|
||||
if (now < cfg->rc_buf_initial_sz)
|
||||
return;
|
||||
if (now < cfg->rc_buf_initial_sz) return;
|
||||
|
||||
if (!cfg->rc_target_bitrate)
|
||||
return;
|
||||
if (!cfg->rc_target_bitrate) return;
|
||||
|
||||
then = now;
|
||||
|
||||
|
@ -98,20 +95,16 @@ void update_rate_histogram(struct rate_hist *hist,
|
|||
const int i_idx = (i - 1) % hist->samples;
|
||||
|
||||
then = hist->pts[i_idx];
|
||||
if (now - then > cfg->rc_buf_sz)
|
||||
break;
|
||||
if (now - then > cfg->rc_buf_sz) break;
|
||||
sum_sz += hist->sz[i_idx];
|
||||
}
|
||||
|
||||
if (now == then)
|
||||
return;
|
||||
if (now == then) return;
|
||||
|
||||
avg_bitrate = sum_sz * 8 * 1000 / (now - then);
|
||||
idx = (int)(avg_bitrate * (RATE_BINS / 2) / (cfg->rc_target_bitrate * 1000));
|
||||
if (idx < 0)
|
||||
idx = 0;
|
||||
if (idx > RATE_BINS - 1)
|
||||
idx = RATE_BINS - 1;
|
||||
if (idx < 0) idx = 0;
|
||||
if (idx > RATE_BINS - 1) idx = RATE_BINS - 1;
|
||||
if (hist->bucket[idx].low > avg_bitrate)
|
||||
hist->bucket[idx].low = (int)avg_bitrate;
|
||||
if (hist->bucket[idx].high < avg_bitrate)
|
||||
|
@ -120,8 +113,8 @@ void update_rate_histogram(struct rate_hist *hist,
|
|||
hist->total++;
|
||||
}
|
||||
|
||||
static int merge_hist_buckets(struct hist_bucket *bucket,
|
||||
int max_buckets, int *num_buckets) {
|
||||
static int merge_hist_buckets(struct hist_bucket *bucket, int max_buckets,
|
||||
int *num_buckets) {
|
||||
int small_bucket = 0, merge_bucket = INT_MAX, big_bucket = 0;
|
||||
int buckets = *num_buckets;
|
||||
int i;
|
||||
|
@ -129,10 +122,8 @@ static int merge_hist_buckets(struct hist_bucket *bucket,
|
|||
/* Find the extrema for this list of buckets */
|
||||
big_bucket = small_bucket = 0;
|
||||
for (i = 0; i < buckets; i++) {
|
||||
if (bucket[i].count < bucket[small_bucket].count)
|
||||
small_bucket = i;
|
||||
if (bucket[i].count > bucket[big_bucket].count)
|
||||
big_bucket = i;
|
||||
if (bucket[i].count < bucket[small_bucket].count) small_bucket = i;
|
||||
if (bucket[i].count > bucket[big_bucket].count) big_bucket = i;
|
||||
}
|
||||
|
||||
/* If we have too many buckets, merge the smallest with an adjacent
|
||||
|
@ -174,13 +165,10 @@ static int merge_hist_buckets(struct hist_bucket *bucket,
|
|||
*/
|
||||
big_bucket = small_bucket = 0;
|
||||
for (i = 0; i < buckets; i++) {
|
||||
if (i > merge_bucket)
|
||||
bucket[i] = bucket[i + 1];
|
||||
if (i > merge_bucket) bucket[i] = bucket[i + 1];
|
||||
|
||||
if (bucket[i].count < bucket[small_bucket].count)
|
||||
small_bucket = i;
|
||||
if (bucket[i].count > bucket[big_bucket].count)
|
||||
big_bucket = i;
|
||||
if (bucket[i].count < bucket[small_bucket].count) small_bucket = i;
|
||||
if (bucket[i].count > bucket[big_bucket].count) big_bucket = i;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -188,8 +176,8 @@ static int merge_hist_buckets(struct hist_bucket *bucket,
|
|||
return bucket[big_bucket].count;
|
||||
}
|
||||
|
||||
static void show_histogram(const struct hist_bucket *bucket,
|
||||
int buckets, int total, int scale) {
|
||||
static void show_histogram(const struct hist_bucket *bucket, int buckets,
|
||||
int total, int scale) {
|
||||
const char *pat1, *pat2;
|
||||
int i;
|
||||
|
||||
|
@ -232,8 +220,7 @@ static void show_histogram(const struct hist_bucket *bucket,
|
|||
|
||||
pct = (float)(100.0 * bucket[i].count / total);
|
||||
len = HIST_BAR_MAX * bucket[i].count / scale;
|
||||
if (len < 1)
|
||||
len = 1;
|
||||
if (len < 1) len = 1;
|
||||
assert(len <= HIST_BAR_MAX);
|
||||
|
||||
if (bucket[i].low == bucket[i].high)
|
||||
|
@ -241,8 +228,7 @@ static void show_histogram(const struct hist_bucket *bucket,
|
|||
else
|
||||
fprintf(stderr, pat2, bucket[i].low, bucket[i].high);
|
||||
|
||||
for (j = 0; j < HIST_BAR_MAX; j++)
|
||||
fprintf(stderr, j < len ? "=" : " ");
|
||||
for (j = 0; j < HIST_BAR_MAX; j++) fprintf(stderr, j < len ? "=" : " ");
|
||||
fprintf(stderr, "\t%5d (%6.2f%%)\n", bucket[i].count, pct);
|
||||
}
|
||||
}
|
||||
|
@ -268,14 +254,13 @@ void show_q_histogram(const int counts[64], int max_buckets) {
|
|||
show_histogram(bucket, buckets, total, scale);
|
||||
}
|
||||
|
||||
void show_rate_histogram(struct rate_hist *hist,
|
||||
const vpx_codec_enc_cfg_t *cfg, int max_buckets) {
|
||||
void show_rate_histogram(struct rate_hist *hist, const vpx_codec_enc_cfg_t *cfg,
|
||||
int max_buckets) {
|
||||
int i, scale;
|
||||
int buckets = 0;
|
||||
|
||||
for (i = 0; i < RATE_BINS; i++) {
|
||||
if (hist->bucket[i].low == INT_MAX)
|
||||
continue;
|
||||
if (hist->bucket[i].low == INT_MAX) continue;
|
||||
hist->bucket[buckets++] = hist->bucket[i];
|
||||
}
|
||||
|
||||
|
|
145
tools_common.c
145
tools_common.c
|
@ -29,23 +29,22 @@
|
|||
#include <fcntl.h>
|
||||
|
||||
#ifdef __OS2__
|
||||
#define _setmode setmode
|
||||
#define _fileno fileno
|
||||
#define _O_BINARY O_BINARY
|
||||
#define _setmode setmode
|
||||
#define _fileno fileno
|
||||
#define _O_BINARY O_BINARY
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define LOG_ERROR(label) do {\
|
||||
const char *l = label;\
|
||||
va_list ap;\
|
||||
va_start(ap, fmt);\
|
||||
if (l)\
|
||||
fprintf(stderr, "%s: ", l);\
|
||||
vfprintf(stderr, fmt, ap);\
|
||||
fprintf(stderr, "\n");\
|
||||
va_end(ap);\
|
||||
} while (0)
|
||||
|
||||
#define LOG_ERROR(label) \
|
||||
do { \
|
||||
const char *l = label; \
|
||||
va_list ap; \
|
||||
va_start(ap, fmt); \
|
||||
if (l) fprintf(stderr, "%s: ", l); \
|
||||
vfprintf(stderr, fmt, ap); \
|
||||
fprintf(stderr, "\n"); \
|
||||
va_end(ap); \
|
||||
} while (0)
|
||||
|
||||
FILE *set_binary_mode(FILE *stream) {
|
||||
(void)stream;
|
||||
|
@ -65,16 +64,13 @@ void fatal(const char *fmt, ...) {
|
|||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
void warn(const char *fmt, ...) {
|
||||
LOG_ERROR("Warning");
|
||||
}
|
||||
void warn(const char *fmt, ...) { LOG_ERROR("Warning"); }
|
||||
|
||||
void die_codec(vpx_codec_ctx_t *ctx, const char *s) {
|
||||
const char *detail = vpx_codec_error_detail(ctx);
|
||||
|
||||
printf("%s: %s\n", s, vpx_codec_error(ctx));
|
||||
if (detail)
|
||||
printf(" %s\n", detail);
|
||||
if (detail) printf(" %s\n", detail);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
|
@ -97,15 +93,16 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame) {
|
|||
*/
|
||||
switch (plane) {
|
||||
case 1:
|
||||
ptr = yuv_frame->planes[
|
||||
yuv_frame->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_V : VPX_PLANE_U];
|
||||
ptr =
|
||||
yuv_frame->planes[yuv_frame->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_V
|
||||
: VPX_PLANE_U];
|
||||
break;
|
||||
case 2:
|
||||
ptr = yuv_frame->planes[
|
||||
yuv_frame->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_U : VPX_PLANE_V];
|
||||
ptr =
|
||||
yuv_frame->planes[yuv_frame->fmt == VPX_IMG_FMT_YV12 ? VPX_PLANE_U
|
||||
: VPX_PLANE_V];
|
||||
break;
|
||||
default:
|
||||
ptr = yuv_frame->planes[plane];
|
||||
default: ptr = yuv_frame->planes[plane];
|
||||
}
|
||||
|
||||
for (r = 0; r < h; ++r) {
|
||||
|
@ -134,7 +131,7 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame) {
|
|||
|
||||
static const VpxInterface vpx_encoders[] = {
|
||||
#if CONFIG_VP10_ENCODER
|
||||
{"vp10", VP10_FOURCC, &vpx_codec_vp10_cx},
|
||||
{ "vp10", VP10_FOURCC, &vpx_codec_vp10_cx },
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -142,17 +139,14 @@ int get_vpx_encoder_count(void) {
|
|||
return sizeof(vpx_encoders) / sizeof(vpx_encoders[0]);
|
||||
}
|
||||
|
||||
const VpxInterface *get_vpx_encoder_by_index(int i) {
|
||||
return &vpx_encoders[i];
|
||||
}
|
||||
const VpxInterface *get_vpx_encoder_by_index(int i) { return &vpx_encoders[i]; }
|
||||
|
||||
const VpxInterface *get_vpx_encoder_by_name(const char *name) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < get_vpx_encoder_count(); ++i) {
|
||||
const VpxInterface *encoder = get_vpx_encoder_by_index(i);
|
||||
if (strcmp(encoder->name, name) == 0)
|
||||
return encoder;
|
||||
if (strcmp(encoder->name, name) == 0) return encoder;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
@ -165,7 +159,7 @@ const VpxInterface *get_vpx_encoder_by_name(const char *name) {
|
|||
static const VpxInterface vpx_decoders[] = {
|
||||
|
||||
#if CONFIG_VP10_DECODER
|
||||
{"vp10", VP10_FOURCC, &vpx_codec_vp10_dx},
|
||||
{ "vp10", VP10_FOURCC, &vpx_codec_vp10_dx },
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -173,17 +167,14 @@ int get_vpx_decoder_count(void) {
|
|||
return sizeof(vpx_decoders) / sizeof(vpx_decoders[0]);
|
||||
}
|
||||
|
||||
const VpxInterface *get_vpx_decoder_by_index(int i) {
|
||||
return &vpx_decoders[i];
|
||||
}
|
||||
const VpxInterface *get_vpx_decoder_by_index(int i) { return &vpx_decoders[i]; }
|
||||
|
||||
const VpxInterface *get_vpx_decoder_by_name(const char *name) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < get_vpx_decoder_count(); ++i) {
|
||||
const VpxInterface *const decoder = get_vpx_decoder_by_index(i);
|
||||
if (strcmp(decoder->name, name) == 0)
|
||||
return decoder;
|
||||
const VpxInterface *const decoder = get_vpx_decoder_by_index(i);
|
||||
if (strcmp(decoder->name, name) == 0) return decoder;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
@ -194,8 +185,7 @@ const VpxInterface *get_vpx_decoder_by_fourcc(uint32_t fourcc) {
|
|||
|
||||
for (i = 0; i < get_vpx_decoder_count(); ++i) {
|
||||
const VpxInterface *const decoder = get_vpx_decoder_by_index(i);
|
||||
if (decoder->fourcc == fourcc)
|
||||
return decoder;
|
||||
if (decoder->fourcc == fourcc) return decoder;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
@ -213,7 +203,7 @@ int vpx_img_plane_width(const vpx_image_t *img, int plane) {
|
|||
}
|
||||
|
||||
int vpx_img_plane_height(const vpx_image_t *img, int plane) {
|
||||
if (plane > 0 && img->y_chroma_shift > 0)
|
||||
if (plane > 0 && img->y_chroma_shift > 0)
|
||||
return (img->d_h + 1) >> img->y_chroma_shift;
|
||||
else
|
||||
return img->d_h;
|
||||
|
@ -226,7 +216,7 @@ void vpx_img_write(const vpx_image_t *img, FILE *file) {
|
|||
const unsigned char *buf = img->planes[plane];
|
||||
const int stride = img->stride[plane];
|
||||
const int w = vpx_img_plane_width(img, plane) *
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
const int h = vpx_img_plane_height(img, plane);
|
||||
int y;
|
||||
|
||||
|
@ -244,13 +234,12 @@ int vpx_img_read(vpx_image_t *img, FILE *file) {
|
|||
unsigned char *buf = img->planes[plane];
|
||||
const int stride = img->stride[plane];
|
||||
const int w = vpx_img_plane_width(img, plane) *
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
const int h = vpx_img_plane_height(img, plane);
|
||||
int y;
|
||||
|
||||
for (y = 0; y < h; ++y) {
|
||||
if (fread(buf, 1, w, file) != (size_t)w)
|
||||
return 0;
|
||||
if (fread(buf, 1, w, file) != (size_t)w) return 0;
|
||||
buf += stride;
|
||||
}
|
||||
}
|
||||
|
@ -279,19 +268,16 @@ static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
int plane;
|
||||
if (dst->d_w != src->d_w || dst->d_h != src->d_h ||
|
||||
dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
dst->y_chroma_shift != src->y_chroma_shift ||
|
||||
dst->fmt != src->fmt || input_shift < 0) {
|
||||
dst->y_chroma_shift != src->y_chroma_shift || dst->fmt != src->fmt ||
|
||||
input_shift < 0) {
|
||||
fatal("Unsupported image conversion");
|
||||
}
|
||||
switch (src->fmt) {
|
||||
case VPX_IMG_FMT_I42016:
|
||||
case VPX_IMG_FMT_I42216:
|
||||
case VPX_IMG_FMT_I44416:
|
||||
case VPX_IMG_FMT_I44016:
|
||||
break;
|
||||
default:
|
||||
fatal("Unsupported image conversion");
|
||||
break;
|
||||
case VPX_IMG_FMT_I44016: break;
|
||||
default: fatal("Unsupported image conversion"); break;
|
||||
}
|
||||
for (plane = 0; plane < 3; plane++) {
|
||||
int w = src->d_w;
|
||||
|
@ -306,8 +292,7 @@ static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
(uint16_t *)(src->planes[plane] + y * src->stride[plane]);
|
||||
uint16_t *p_dst =
|
||||
(uint16_t *)(dst->planes[plane] + y * dst->stride[plane]);
|
||||
for (x = 0; x < w; x++)
|
||||
*p_dst++ = (*p_src++ << input_shift) + offset;
|
||||
for (x = 0; x < w; x++) *p_dst++ = (*p_src++ << input_shift) + offset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -320,19 +305,15 @@ static void lowbd_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
if (dst->d_w != src->d_w || dst->d_h != src->d_h ||
|
||||
dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
dst->y_chroma_shift != src->y_chroma_shift ||
|
||||
dst->fmt != src->fmt + VPX_IMG_FMT_HIGHBITDEPTH ||
|
||||
input_shift < 0) {
|
||||
dst->fmt != src->fmt + VPX_IMG_FMT_HIGHBITDEPTH || input_shift < 0) {
|
||||
fatal("Unsupported image conversion");
|
||||
}
|
||||
switch (src->fmt) {
|
||||
case VPX_IMG_FMT_I420:
|
||||
case VPX_IMG_FMT_I422:
|
||||
case VPX_IMG_FMT_I444:
|
||||
case VPX_IMG_FMT_I440:
|
||||
break;
|
||||
default:
|
||||
fatal("Unsupported image conversion");
|
||||
break;
|
||||
case VPX_IMG_FMT_I440: break;
|
||||
default: fatal("Unsupported image conversion"); break;
|
||||
}
|
||||
for (plane = 0; plane < 3; plane++) {
|
||||
int w = src->d_w;
|
||||
|
@ -353,8 +334,7 @@ static void lowbd_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
}
|
||||
}
|
||||
|
||||
void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
||||
int input_shift) {
|
||||
void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src, int input_shift) {
|
||||
if (src->fmt & VPX_IMG_FMT_HIGHBITDEPTH) {
|
||||
highbd_img_upshift(dst, src, input_shift);
|
||||
} else {
|
||||
|
@ -364,9 +344,8 @@ void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
|
||||
void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src) {
|
||||
int plane;
|
||||
if (dst->fmt + VPX_IMG_FMT_HIGHBITDEPTH != src->fmt ||
|
||||
dst->d_w != src->d_w || dst->d_h != src->d_h ||
|
||||
dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
if (dst->fmt + VPX_IMG_FMT_HIGHBITDEPTH != src->fmt || dst->d_w != src->d_w ||
|
||||
dst->d_h != src->d_h || dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
dst->y_chroma_shift != src->y_chroma_shift) {
|
||||
fatal("Unsupported image conversion");
|
||||
}
|
||||
|
@ -374,11 +353,8 @@ void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src) {
|
|||
case VPX_IMG_FMT_I420:
|
||||
case VPX_IMG_FMT_I422:
|
||||
case VPX_IMG_FMT_I444:
|
||||
case VPX_IMG_FMT_I440:
|
||||
break;
|
||||
default:
|
||||
fatal("Unsupported image conversion");
|
||||
break;
|
||||
case VPX_IMG_FMT_I440: break;
|
||||
default: fatal("Unsupported image conversion"); break;
|
||||
}
|
||||
for (plane = 0; plane < 3; plane++) {
|
||||
int w = src->d_w;
|
||||
|
@ -404,19 +380,16 @@ static void highbd_img_downshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
int plane;
|
||||
if (dst->d_w != src->d_w || dst->d_h != src->d_h ||
|
||||
dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
dst->y_chroma_shift != src->y_chroma_shift ||
|
||||
dst->fmt != src->fmt || down_shift < 0) {
|
||||
dst->y_chroma_shift != src->y_chroma_shift || dst->fmt != src->fmt ||
|
||||
down_shift < 0) {
|
||||
fatal("Unsupported image conversion");
|
||||
}
|
||||
switch (src->fmt) {
|
||||
case VPX_IMG_FMT_I42016:
|
||||
case VPX_IMG_FMT_I42216:
|
||||
case VPX_IMG_FMT_I44416:
|
||||
case VPX_IMG_FMT_I44016:
|
||||
break;
|
||||
default:
|
||||
fatal("Unsupported image conversion");
|
||||
break;
|
||||
case VPX_IMG_FMT_I44016: break;
|
||||
default: fatal("Unsupported image conversion"); break;
|
||||
}
|
||||
for (plane = 0; plane < 3; plane++) {
|
||||
int w = src->d_w;
|
||||
|
@ -431,8 +404,7 @@ static void highbd_img_downshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
(uint16_t *)(src->planes[plane] + y * src->stride[plane]);
|
||||
uint16_t *p_dst =
|
||||
(uint16_t *)(dst->planes[plane] + y * dst->stride[plane]);
|
||||
for (x = 0; x < w; x++)
|
||||
*p_dst++ = *p_src++ >> down_shift;
|
||||
for (x = 0; x < w; x++) *p_dst++ = *p_src++ >> down_shift;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -443,19 +415,15 @@ static void lowbd_img_downshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
if (dst->d_w != src->d_w || dst->d_h != src->d_h ||
|
||||
dst->x_chroma_shift != src->x_chroma_shift ||
|
||||
dst->y_chroma_shift != src->y_chroma_shift ||
|
||||
src->fmt != dst->fmt + VPX_IMG_FMT_HIGHBITDEPTH ||
|
||||
down_shift < 0) {
|
||||
src->fmt != dst->fmt + VPX_IMG_FMT_HIGHBITDEPTH || down_shift < 0) {
|
||||
fatal("Unsupported image conversion");
|
||||
}
|
||||
switch (dst->fmt) {
|
||||
case VPX_IMG_FMT_I420:
|
||||
case VPX_IMG_FMT_I422:
|
||||
case VPX_IMG_FMT_I444:
|
||||
case VPX_IMG_FMT_I440:
|
||||
break;
|
||||
default:
|
||||
fatal("Unsupported image conversion");
|
||||
break;
|
||||
case VPX_IMG_FMT_I440: break;
|
||||
default: fatal("Unsupported image conversion"); break;
|
||||
}
|
||||
for (plane = 0; plane < 3; plane++) {
|
||||
int w = src->d_w;
|
||||
|
@ -476,8 +444,7 @@ static void lowbd_img_downshift(vpx_image_t *dst, vpx_image_t *src,
|
|||
}
|
||||
}
|
||||
|
||||
void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src,
|
||||
int down_shift) {
|
||||
void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, int down_shift) {
|
||||
if (dst->fmt & VPX_IMG_FMT_HIGHBITDEPTH) {
|
||||
highbd_img_downshift(dst, src, down_shift);
|
||||
} else {
|
||||
|
|
|
@ -30,24 +30,24 @@
|
|||
/* MinGW uses f{seek,tell}o64 for large files. */
|
||||
#define fseeko fseeko64
|
||||
#define ftello ftello64
|
||||
#endif /* _WIN32 */
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#if CONFIG_OS_SUPPORT
|
||||
#if defined(_MSC_VER)
|
||||
#include <io.h> /* NOLINT */
|
||||
#define isatty _isatty
|
||||
#define fileno _fileno
|
||||
#include <io.h> /* NOLINT */
|
||||
#define isatty _isatty
|
||||
#define fileno _fileno
|
||||
#else
|
||||
#include <unistd.h> /* NOLINT */
|
||||
#endif /* _MSC_VER */
|
||||
#endif /* CONFIG_OS_SUPPORT */
|
||||
#include <unistd.h> /* NOLINT */
|
||||
#endif /* _MSC_VER */
|
||||
#endif /* CONFIG_OS_SUPPORT */
|
||||
|
||||
/* Use 32-bit file operations in WebM file format when building ARM
|
||||
* executables (.axf) with RVCT. */
|
||||
#if !CONFIG_OS_SUPPORT
|
||||
#define fseeko fseek
|
||||
#define ftello ftell
|
||||
#endif /* CONFIG_OS_SUPPORT */
|
||||
#endif /* CONFIG_OS_SUPPORT */
|
||||
|
||||
#define LITERALU64(hi, lo) ((((uint64_t)hi) << 32) | lo)
|
||||
|
||||
|
@ -55,7 +55,7 @@
|
|||
#define PATH_MAX 512
|
||||
#endif
|
||||
|
||||
#define IVF_FRAME_HDR_SZ (4 + 8) /* 4 byte size + 8 byte timestamp */
|
||||
#define IVF_FRAME_HDR_SZ (4 + 8) /* 4 byte size + 8 byte timestamp */
|
||||
#define IVF_FILE_HDR_SZ 32
|
||||
|
||||
#define RAW_FRAME_HDR_SZ sizeof(uint32_t)
|
||||
|
@ -158,7 +158,7 @@ void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src);
|
|||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif // TOOLS_COMMON_H_
|
||||
|
|
|
@ -30,21 +30,17 @@ VpxVideoReader *vpx_video_reader_open(const char *filename) {
|
|||
char header[32];
|
||||
VpxVideoReader *reader = NULL;
|
||||
FILE *const file = fopen(filename, "rb");
|
||||
if (!file)
|
||||
return NULL; // Can't open file
|
||||
if (!file) return NULL; // Can't open file
|
||||
|
||||
if (fread(header, 1, 32, file) != 32)
|
||||
return NULL; // Can't read file header
|
||||
if (fread(header, 1, 32, file) != 32) return NULL; // Can't read file header
|
||||
|
||||
if (memcmp(kIVFSignature, header, 4) != 0)
|
||||
return NULL; // Wrong IVF signature
|
||||
|
||||
if (mem_get_le16(header + 4) != 0)
|
||||
return NULL; // Wrong IVF version
|
||||
if (mem_get_le16(header + 4) != 0) return NULL; // Wrong IVF version
|
||||
|
||||
reader = calloc(1, sizeof(*reader));
|
||||
if (!reader)
|
||||
return NULL; // Can't allocate VpxVideoReader
|
||||
if (!reader) return NULL; // Can't allocate VpxVideoReader
|
||||
|
||||
reader->file = file;
|
||||
reader->info.codec_fourcc = mem_get_le32(header + 8);
|
||||
|
@ -71,8 +67,7 @@ int vpx_video_reader_read_frame(VpxVideoReader *reader) {
|
|||
|
||||
const uint8_t *vpx_video_reader_get_frame(VpxVideoReader *reader,
|
||||
size_t *size) {
|
||||
if (size)
|
||||
*size = reader->frame_size;
|
||||
if (size) *size = reader->frame_size;
|
||||
|
||||
return reader->buffer;
|
||||
}
|
||||
|
@ -80,4 +75,3 @@ const uint8_t *vpx_video_reader_get_frame(VpxVideoReader *reader,
|
|||
const VpxVideoInfo *vpx_video_reader_get_info(VpxVideoReader *reader) {
|
||||
return &reader->info;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ int vpx_video_reader_read_frame(VpxVideoReader *reader);
|
|||
|
||||
// Returns the pointer to memory buffer with frame data read by last call to
|
||||
// vpx_video_reader_read_frame().
|
||||
const uint8_t *vpx_video_reader_get_frame(VpxVideoReader *reader,
|
||||
size_t *size);
|
||||
const uint8_t *vpx_video_reader_get_frame(VpxVideoReader *reader, size_t *size);
|
||||
|
||||
// Fills VpxVideoInfo with information from opened video file.
|
||||
const VpxVideoInfo *vpx_video_reader_get_info(VpxVideoReader *reader);
|
||||
|
|
|
@ -37,12 +37,10 @@ VpxVideoWriter *vpx_video_writer_open(const char *filename,
|
|||
if (container == kContainerIVF) {
|
||||
VpxVideoWriter *writer = NULL;
|
||||
FILE *const file = fopen(filename, "wb");
|
||||
if (!file)
|
||||
return NULL;
|
||||
if (!file) return NULL;
|
||||
|
||||
writer = malloc(sizeof(*writer));
|
||||
if (!writer)
|
||||
return NULL;
|
||||
if (!writer) return NULL;
|
||||
|
||||
writer->frame_count = 0;
|
||||
writer->info = *info;
|
||||
|
@ -67,12 +65,10 @@ void vpx_video_writer_close(VpxVideoWriter *writer) {
|
|||
}
|
||||
}
|
||||
|
||||
int vpx_video_writer_write_frame(VpxVideoWriter *writer,
|
||||
const uint8_t *buffer, size_t size,
|
||||
int64_t pts) {
|
||||
int vpx_video_writer_write_frame(VpxVideoWriter *writer, const uint8_t *buffer,
|
||||
size_t size, int64_t pts) {
|
||||
ivf_write_frame_header(writer->file, pts, size);
|
||||
if (fwrite(buffer, 1, size, writer->file) != size)
|
||||
return 0;
|
||||
if (fwrite(buffer, 1, size, writer->file) != size) return 0;
|
||||
|
||||
++writer->frame_count;
|
||||
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
|
||||
#include "./video_common.h"
|
||||
|
||||
typedef enum {
|
||||
kContainerIVF
|
||||
} VpxContainer;
|
||||
typedef enum { kContainerIVF } VpxContainer;
|
||||
|
||||
struct VpxVideoWriterStruct;
|
||||
typedef struct VpxVideoWriterStruct VpxVideoWriter;
|
||||
|
@ -36,9 +34,8 @@ VpxVideoWriter *vpx_video_writer_open(const char *filename,
|
|||
void vpx_video_writer_close(VpxVideoWriter *writer);
|
||||
|
||||
// Writes frame bytes to the file.
|
||||
int vpx_video_writer_write_frame(VpxVideoWriter *writer,
|
||||
const uint8_t *buffer, size_t size,
|
||||
int64_t pts);
|
||||
int vpx_video_writer_write_frame(VpxVideoWriter *writer, const uint8_t *buffer,
|
||||
size_t size, int64_t pts);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
|
|
452
vpxdec.c
452
vpxdec.c
|
@ -47,117 +47,124 @@ struct VpxDecInputContext {
|
|||
struct WebmInputContext *webm_ctx;
|
||||
};
|
||||
|
||||
static const arg_def_t looparg = ARG_DEF(
|
||||
NULL, "loops", 1, "Number of times to decode the file");
|
||||
static const arg_def_t codecarg = ARG_DEF(
|
||||
NULL, "codec", 1, "Codec to use");
|
||||
static const arg_def_t use_yv12 = ARG_DEF(
|
||||
NULL, "yv12", 0, "Output raw YV12 frames");
|
||||
static const arg_def_t use_i420 = ARG_DEF(
|
||||
NULL, "i420", 0, "Output raw I420 frames");
|
||||
static const arg_def_t flipuvarg = ARG_DEF(
|
||||
NULL, "flipuv", 0, "Flip the chroma planes in the output");
|
||||
static const arg_def_t rawvideo = ARG_DEF(
|
||||
NULL, "rawvideo", 0, "Output raw YUV frames");
|
||||
static const arg_def_t noblitarg = ARG_DEF(
|
||||
NULL, "noblit", 0, "Don't process the decoded frames");
|
||||
static const arg_def_t progressarg = ARG_DEF(
|
||||
NULL, "progress", 0, "Show progress after each frame decodes");
|
||||
static const arg_def_t limitarg = ARG_DEF(
|
||||
NULL, "limit", 1, "Stop decoding after n frames");
|
||||
static const arg_def_t skiparg = ARG_DEF(
|
||||
NULL, "skip", 1, "Skip the first n input frames");
|
||||
static const arg_def_t postprocarg = ARG_DEF(
|
||||
NULL, "postproc", 0, "Postprocess decoded frames");
|
||||
static const arg_def_t summaryarg = ARG_DEF(
|
||||
NULL, "summary", 0, "Show timing summary");
|
||||
static const arg_def_t outputfile = ARG_DEF(
|
||||
"o", "output", 1, "Output file name pattern (see below)");
|
||||
static const arg_def_t threadsarg = ARG_DEF(
|
||||
"t", "threads", 1, "Max threads to use");
|
||||
static const arg_def_t frameparallelarg = ARG_DEF(
|
||||
NULL, "frame-parallel", 0, "Frame parallel decode");
|
||||
static const arg_def_t verbosearg = ARG_DEF(
|
||||
"v", "verbose", 0, "Show version string");
|
||||
static const arg_def_t error_concealment = ARG_DEF(
|
||||
NULL, "error-concealment", 0, "Enable decoder error-concealment");
|
||||
static const arg_def_t scalearg = ARG_DEF(
|
||||
"S", "scale", 0, "Scale output frames uniformly");
|
||||
static const arg_def_t continuearg = ARG_DEF(
|
||||
"k", "keep-going", 0, "(debug) Continue decoding after error");
|
||||
static const arg_def_t fb_arg = ARG_DEF(
|
||||
NULL, "frame-buffers", 1, "Number of frame buffers to use");
|
||||
static const arg_def_t md5arg = ARG_DEF(
|
||||
NULL, "md5", 0, "Compute the MD5 sum of the decoded frame");
|
||||
static const arg_def_t looparg =
|
||||
ARG_DEF(NULL, "loops", 1, "Number of times to decode the file");
|
||||
static const arg_def_t codecarg = ARG_DEF(NULL, "codec", 1, "Codec to use");
|
||||
static const arg_def_t use_yv12 =
|
||||
ARG_DEF(NULL, "yv12", 0, "Output raw YV12 frames");
|
||||
static const arg_def_t use_i420 =
|
||||
ARG_DEF(NULL, "i420", 0, "Output raw I420 frames");
|
||||
static const arg_def_t flipuvarg =
|
||||
ARG_DEF(NULL, "flipuv", 0, "Flip the chroma planes in the output");
|
||||
static const arg_def_t rawvideo =
|
||||
ARG_DEF(NULL, "rawvideo", 0, "Output raw YUV frames");
|
||||
static const arg_def_t noblitarg =
|
||||
ARG_DEF(NULL, "noblit", 0, "Don't process the decoded frames");
|
||||
static const arg_def_t progressarg =
|
||||
ARG_DEF(NULL, "progress", 0, "Show progress after each frame decodes");
|
||||
static const arg_def_t limitarg =
|
||||
ARG_DEF(NULL, "limit", 1, "Stop decoding after n frames");
|
||||
static const arg_def_t skiparg =
|
||||
ARG_DEF(NULL, "skip", 1, "Skip the first n input frames");
|
||||
static const arg_def_t postprocarg =
|
||||
ARG_DEF(NULL, "postproc", 0, "Postprocess decoded frames");
|
||||
static const arg_def_t summaryarg =
|
||||
ARG_DEF(NULL, "summary", 0, "Show timing summary");
|
||||
static const arg_def_t outputfile =
|
||||
ARG_DEF("o", "output", 1, "Output file name pattern (see below)");
|
||||
static const arg_def_t threadsarg =
|
||||
ARG_DEF("t", "threads", 1, "Max threads to use");
|
||||
static const arg_def_t frameparallelarg =
|
||||
ARG_DEF(NULL, "frame-parallel", 0, "Frame parallel decode");
|
||||
static const arg_def_t verbosearg =
|
||||
ARG_DEF("v", "verbose", 0, "Show version string");
|
||||
static const arg_def_t error_concealment =
|
||||
ARG_DEF(NULL, "error-concealment", 0, "Enable decoder error-concealment");
|
||||
static const arg_def_t scalearg =
|
||||
ARG_DEF("S", "scale", 0, "Scale output frames uniformly");
|
||||
static const arg_def_t continuearg =
|
||||
ARG_DEF("k", "keep-going", 0, "(debug) Continue decoding after error");
|
||||
static const arg_def_t fb_arg =
|
||||
ARG_DEF(NULL, "frame-buffers", 1, "Number of frame buffers to use");
|
||||
static const arg_def_t md5arg =
|
||||
ARG_DEF(NULL, "md5", 0, "Compute the MD5 sum of the decoded frame");
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
static const arg_def_t outbitdeptharg = ARG_DEF(
|
||||
NULL, "output-bit-depth", 1, "Output bit-depth for decoded frames");
|
||||
static const arg_def_t outbitdeptharg =
|
||||
ARG_DEF(NULL, "output-bit-depth", 1, "Output bit-depth for decoded frames");
|
||||
#endif
|
||||
#if CONFIG_EXT_TILE
|
||||
static const arg_def_t tiler = ARG_DEF(
|
||||
NULL, "tile-row", 1, "Row index of tile to decode "
|
||||
"(-1 for all rows)");
|
||||
static const arg_def_t tilec = ARG_DEF(
|
||||
NULL, "tile-column", 1, "Column index of tile to decode "
|
||||
"(-1 for all columns)");
|
||||
static const arg_def_t tiler = ARG_DEF(NULL, "tile-row", 1,
|
||||
"Row index of tile to decode "
|
||||
"(-1 for all rows)");
|
||||
static const arg_def_t tilec = ARG_DEF(NULL, "tile-column", 1,
|
||||
"Column index of tile to decode "
|
||||
"(-1 for all columns)");
|
||||
#endif // CONFIG_EXT_TILE
|
||||
|
||||
static const arg_def_t *all_args[] = {
|
||||
&codecarg, &use_yv12, &use_i420, &flipuvarg, &rawvideo, &noblitarg,
|
||||
&progressarg, &limitarg, &skiparg, &postprocarg, &summaryarg, &outputfile,
|
||||
&threadsarg, &frameparallelarg, &verbosearg, &scalearg, &fb_arg,
|
||||
&md5arg, &error_concealment, &continuearg,
|
||||
static const arg_def_t *all_args[] = { &codecarg,
|
||||
&use_yv12,
|
||||
&use_i420,
|
||||
&flipuvarg,
|
||||
&rawvideo,
|
||||
&noblitarg,
|
||||
&progressarg,
|
||||
&limitarg,
|
||||
&skiparg,
|
||||
&postprocarg,
|
||||
&summaryarg,
|
||||
&outputfile,
|
||||
&threadsarg,
|
||||
&frameparallelarg,
|
||||
&verbosearg,
|
||||
&scalearg,
|
||||
&fb_arg,
|
||||
&md5arg,
|
||||
&error_concealment,
|
||||
&continuearg,
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
&outbitdeptharg,
|
||||
&outbitdeptharg,
|
||||
#endif
|
||||
#if CONFIG_EXT_TILE
|
||||
&tiler, &tilec,
|
||||
&tiler,
|
||||
&tilec,
|
||||
#endif // CONFIG_EXT_TILE
|
||||
NULL
|
||||
};
|
||||
NULL };
|
||||
|
||||
#if CONFIG_LIBYUV
|
||||
static INLINE int libyuv_scale(vpx_image_t *src, vpx_image_t *dst,
|
||||
FilterModeEnum mode) {
|
||||
FilterModeEnum mode) {
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
if (src->fmt == VPX_IMG_FMT_I42016) {
|
||||
assert(dst->fmt == VPX_IMG_FMT_I42016);
|
||||
return I420Scale_16((uint16_t*)src->planes[VPX_PLANE_Y],
|
||||
src->stride[VPX_PLANE_Y]/2,
|
||||
(uint16_t*)src->planes[VPX_PLANE_U],
|
||||
src->stride[VPX_PLANE_U]/2,
|
||||
(uint16_t*)src->planes[VPX_PLANE_V],
|
||||
src->stride[VPX_PLANE_V]/2,
|
||||
src->d_w, src->d_h,
|
||||
(uint16_t*)dst->planes[VPX_PLANE_Y],
|
||||
dst->stride[VPX_PLANE_Y]/2,
|
||||
(uint16_t*)dst->planes[VPX_PLANE_U],
|
||||
dst->stride[VPX_PLANE_U]/2,
|
||||
(uint16_t*)dst->planes[VPX_PLANE_V],
|
||||
dst->stride[VPX_PLANE_V]/2,
|
||||
dst->d_w, dst->d_h,
|
||||
mode);
|
||||
return I420Scale_16(
|
||||
(uint16_t *)src->planes[VPX_PLANE_Y], src->stride[VPX_PLANE_Y] / 2,
|
||||
(uint16_t *)src->planes[VPX_PLANE_U], src->stride[VPX_PLANE_U] / 2,
|
||||
(uint16_t *)src->planes[VPX_PLANE_V], src->stride[VPX_PLANE_V] / 2,
|
||||
src->d_w, src->d_h, (uint16_t *)dst->planes[VPX_PLANE_Y],
|
||||
dst->stride[VPX_PLANE_Y] / 2, (uint16_t *)dst->planes[VPX_PLANE_U],
|
||||
dst->stride[VPX_PLANE_U] / 2, (uint16_t *)dst->planes[VPX_PLANE_V],
|
||||
dst->stride[VPX_PLANE_V] / 2, dst->d_w, dst->d_h, mode);
|
||||
}
|
||||
#endif
|
||||
assert(src->fmt == VPX_IMG_FMT_I420);
|
||||
assert(dst->fmt == VPX_IMG_FMT_I420);
|
||||
return I420Scale(src->planes[VPX_PLANE_Y], src->stride[VPX_PLANE_Y],
|
||||
src->planes[VPX_PLANE_U], src->stride[VPX_PLANE_U],
|
||||
src->planes[VPX_PLANE_V], src->stride[VPX_PLANE_V],
|
||||
src->d_w, src->d_h,
|
||||
dst->planes[VPX_PLANE_Y], dst->stride[VPX_PLANE_Y],
|
||||
src->planes[VPX_PLANE_V], src->stride[VPX_PLANE_V], src->d_w,
|
||||
src->d_h, dst->planes[VPX_PLANE_Y], dst->stride[VPX_PLANE_Y],
|
||||
dst->planes[VPX_PLANE_U], dst->stride[VPX_PLANE_U],
|
||||
dst->planes[VPX_PLANE_V], dst->stride[VPX_PLANE_V],
|
||||
dst->d_w, dst->d_h,
|
||||
mode);
|
||||
dst->planes[VPX_PLANE_V], dst->stride[VPX_PLANE_V], dst->d_w,
|
||||
dst->d_h, mode);
|
||||
}
|
||||
#endif
|
||||
|
||||
void usage_exit(void) {
|
||||
int i;
|
||||
|
||||
fprintf(stderr, "Usage: %s <options> filename\n\n"
|
||||
"Options:\n", exec_name);
|
||||
fprintf(stderr,
|
||||
"Usage: %s <options> filename\n\n"
|
||||
"Options:\n",
|
||||
exec_name);
|
||||
arg_show_usage(stderr, all_args);
|
||||
fprintf(stderr,
|
||||
"\nOutput File Patterns:\n\n"
|
||||
|
@ -172,27 +179,25 @@ void usage_exit(void) {
|
|||
"\n\t%%<n> - Frame number, zero padded to <n> places (1..9)"
|
||||
"\n\n Pattern arguments are only supported in conjunction "
|
||||
"with the --yv12 and\n --i420 options. If the -o option is "
|
||||
"not specified, the output will be\n directed to stdout.\n"
|
||||
);
|
||||
"not specified, the output will be\n directed to stdout.\n");
|
||||
fprintf(stderr, "\nIncluded decoders:\n\n");
|
||||
|
||||
for (i = 0; i < get_vpx_decoder_count(); ++i) {
|
||||
const VpxInterface *const decoder = get_vpx_decoder_by_index(i);
|
||||
fprintf(stderr, " %-6s - %s\n",
|
||||
decoder->name, vpx_codec_iface_name(decoder->codec_interface()));
|
||||
fprintf(stderr, " %-6s - %s\n", decoder->name,
|
||||
vpx_codec_iface_name(decoder->codec_interface()));
|
||||
}
|
||||
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static int raw_read_frame(FILE *infile, uint8_t **buffer,
|
||||
size_t *bytes_read, size_t *buffer_size) {
|
||||
static int raw_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
|
||||
size_t *buffer_size) {
|
||||
char raw_hdr[RAW_FRAME_HDR_SZ];
|
||||
size_t frame_size = 0;
|
||||
|
||||
if (fread(raw_hdr, RAW_FRAME_HDR_SZ, 1, infile) != 1) {
|
||||
if (!feof(infile))
|
||||
warn("Failed to read RAW frame size\n");
|
||||
if (!feof(infile)) warn("Failed to read RAW frame size\n");
|
||||
} else {
|
||||
const size_t kCorruptFrameThreshold = 256 * 1024 * 1024;
|
||||
const size_t kFrameTooSmallThreshold = 256 * 1024;
|
||||
|
@ -239,13 +244,12 @@ static int read_frame(struct VpxDecInputContext *input, uint8_t **buf,
|
|||
return webm_read_frame(input->webm_ctx, buf, bytes_in_buffer);
|
||||
#endif
|
||||
case FILE_TYPE_RAW:
|
||||
return raw_read_frame(input->vpx_input_ctx->file,
|
||||
buf, bytes_in_buffer, buffer_size);
|
||||
return raw_read_frame(input->vpx_input_ctx->file, buf, bytes_in_buffer,
|
||||
buffer_size);
|
||||
case FILE_TYPE_IVF:
|
||||
return ivf_read_frame(input->vpx_input_ctx->file,
|
||||
buf, bytes_in_buffer, buffer_size);
|
||||
default:
|
||||
return 1;
|
||||
return ivf_read_frame(input->vpx_input_ctx->file, buf, bytes_in_buffer,
|
||||
buffer_size);
|
||||
default: return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -258,7 +262,7 @@ static void update_image_md5(const vpx_image_t *img, const int planes[3],
|
|||
const unsigned char *buf = img->planes[plane];
|
||||
const int stride = img->stride[plane];
|
||||
const int w = vpx_img_plane_width(img, plane) *
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
((img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? 2 : 1);
|
||||
const int h = vpx_img_plane_height(img, plane);
|
||||
|
||||
for (y = 0; y < h; ++y) {
|
||||
|
@ -304,8 +308,8 @@ static int file_is_raw(struct VpxInputContext *input) {
|
|||
if (mem_get_le32(buf) < 256 * 1024 * 1024) {
|
||||
for (i = 0; i < get_vpx_decoder_count(); ++i) {
|
||||
const VpxInterface *const decoder = get_vpx_decoder_by_index(i);
|
||||
if (!vpx_codec_peek_stream_info(decoder->codec_interface(),
|
||||
buf + 4, 32 - 4, &si)) {
|
||||
if (!vpx_codec_peek_stream_info(decoder->codec_interface(), buf + 4,
|
||||
32 - 4, &si)) {
|
||||
is_raw = 1;
|
||||
input->fourcc = decoder->fourcc;
|
||||
input->width = si.w;
|
||||
|
@ -324,13 +328,13 @@ static int file_is_raw(struct VpxInputContext *input) {
|
|||
|
||||
static void show_progress(int frame_in, int frame_out, uint64_t dx_time) {
|
||||
fprintf(stderr,
|
||||
"%d decoded frames/%d showed frames in %"PRId64" us (%.2f fps)\r",
|
||||
"%d decoded frames/%d showed frames in %" PRId64 " us (%.2f fps)\r",
|
||||
frame_in, frame_out, dx_time,
|
||||
(double)frame_out * 1000000.0 / (double)dx_time);
|
||||
}
|
||||
|
||||
struct ExternalFrameBuffer {
|
||||
uint8_t* data;
|
||||
uint8_t *data;
|
||||
size_t size;
|
||||
int in_use;
|
||||
};
|
||||
|
@ -349,23 +353,19 @@ static int get_vp9_frame_buffer(void *cb_priv, size_t min_size,
|
|||
int i;
|
||||
struct ExternalFrameBufferList *const ext_fb_list =
|
||||
(struct ExternalFrameBufferList *)cb_priv;
|
||||
if (ext_fb_list == NULL)
|
||||
return -1;
|
||||
if (ext_fb_list == NULL) return -1;
|
||||
|
||||
// Find a free frame buffer.
|
||||
for (i = 0; i < ext_fb_list->num_external_frame_buffers; ++i) {
|
||||
if (!ext_fb_list->ext_fb[i].in_use)
|
||||
break;
|
||||
if (!ext_fb_list->ext_fb[i].in_use) break;
|
||||
}
|
||||
|
||||
if (i == ext_fb_list->num_external_frame_buffers)
|
||||
return -1;
|
||||
if (i == ext_fb_list->num_external_frame_buffers) return -1;
|
||||
|
||||
if (ext_fb_list->ext_fb[i].size < min_size) {
|
||||
free(ext_fb_list->ext_fb[i].data);
|
||||
ext_fb_list->ext_fb[i].data = (uint8_t *)calloc(min_size, sizeof(uint8_t));
|
||||
if (!ext_fb_list->ext_fb[i].data)
|
||||
return -1;
|
||||
if (!ext_fb_list->ext_fb[i].data) return -1;
|
||||
|
||||
ext_fb_list->ext_fb[i].size = min_size;
|
||||
}
|
||||
|
@ -406,47 +406,22 @@ static void generate_filename(const char *pattern, char *out, size_t q_len,
|
|||
/* parse the pattern */
|
||||
q[q_len - 1] = '\0';
|
||||
switch (p[1]) {
|
||||
case 'w':
|
||||
snprintf(q, q_len - 1, "%d", d_w);
|
||||
break;
|
||||
case 'h':
|
||||
snprintf(q, q_len - 1, "%d", d_h);
|
||||
break;
|
||||
case '1':
|
||||
snprintf(q, q_len - 1, "%d", frame_in);
|
||||
break;
|
||||
case '2':
|
||||
snprintf(q, q_len - 1, "%02d", frame_in);
|
||||
break;
|
||||
case '3':
|
||||
snprintf(q, q_len - 1, "%03d", frame_in);
|
||||
break;
|
||||
case '4':
|
||||
snprintf(q, q_len - 1, "%04d", frame_in);
|
||||
break;
|
||||
case '5':
|
||||
snprintf(q, q_len - 1, "%05d", frame_in);
|
||||
break;
|
||||
case '6':
|
||||
snprintf(q, q_len - 1, "%06d", frame_in);
|
||||
break;
|
||||
case '7':
|
||||
snprintf(q, q_len - 1, "%07d", frame_in);
|
||||
break;
|
||||
case '8':
|
||||
snprintf(q, q_len - 1, "%08d", frame_in);
|
||||
break;
|
||||
case '9':
|
||||
snprintf(q, q_len - 1, "%09d", frame_in);
|
||||
break;
|
||||
default:
|
||||
die("Unrecognized pattern %%%c\n", p[1]);
|
||||
break;
|
||||
case 'w': snprintf(q, q_len - 1, "%d", d_w); break;
|
||||
case 'h': snprintf(q, q_len - 1, "%d", d_h); break;
|
||||
case '1': snprintf(q, q_len - 1, "%d", frame_in); break;
|
||||
case '2': snprintf(q, q_len - 1, "%02d", frame_in); break;
|
||||
case '3': snprintf(q, q_len - 1, "%03d", frame_in); break;
|
||||
case '4': snprintf(q, q_len - 1, "%04d", frame_in); break;
|
||||
case '5': snprintf(q, q_len - 1, "%05d", frame_in); break;
|
||||
case '6': snprintf(q, q_len - 1, "%06d", frame_in); break;
|
||||
case '7': snprintf(q, q_len - 1, "%07d", frame_in); break;
|
||||
case '8': snprintf(q, q_len - 1, "%08d", frame_in); break;
|
||||
case '9': snprintf(q, q_len - 1, "%09d", frame_in); break;
|
||||
default: die("Unrecognized pattern %%%c\n", p[1]); break;
|
||||
}
|
||||
|
||||
pat_len = strlen(q);
|
||||
if (pat_len >= q_len - 1)
|
||||
die("Output filename too long.\n");
|
||||
if (pat_len >= q_len - 1) die("Output filename too long.\n");
|
||||
q += pat_len;
|
||||
p += 2;
|
||||
q_len -= pat_len;
|
||||
|
@ -459,8 +434,7 @@ static void generate_filename(const char *pattern, char *out, size_t q_len,
|
|||
else
|
||||
copy_len = next_pat - p;
|
||||
|
||||
if (copy_len >= q_len - 1)
|
||||
die("Output filename too long.\n");
|
||||
if (copy_len >= q_len - 1) die("Output filename too long.\n");
|
||||
|
||||
memcpy(q, p, copy_len);
|
||||
q[copy_len] = '\0';
|
||||
|
@ -478,8 +452,7 @@ static int is_single_file(const char *outfile_pattern) {
|
|||
p = strchr(p, '%');
|
||||
if (p && p[1] >= '1' && p[1] <= '9')
|
||||
return 0; // pattern contains sequence number, so it's not unique
|
||||
if (p)
|
||||
p++;
|
||||
if (p) p++;
|
||||
} while (p);
|
||||
|
||||
return 1;
|
||||
|
@ -488,8 +461,7 @@ static int is_single_file(const char *outfile_pattern) {
|
|||
static void print_md5(unsigned char digest[16], const char *filename) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 16; ++i)
|
||||
printf("%02x", digest[i]);
|
||||
for (i = 0; i < 16; ++i) printf("%02x", digest[i]);
|
||||
printf(" %s\n", filename);
|
||||
}
|
||||
|
||||
|
@ -499,8 +471,7 @@ static FILE *open_outfile(const char *name) {
|
|||
return stdout;
|
||||
} else {
|
||||
FILE *file = fopen(name, "wb");
|
||||
if (!file)
|
||||
fatal("Failed to open output file '%s'", name);
|
||||
if (!file) fatal("Failed to open output file '%s'", name);
|
||||
return file;
|
||||
}
|
||||
}
|
||||
|
@ -509,62 +480,61 @@ static FILE *open_outfile(const char *name) {
|
|||
static int img_shifted_realloc_required(const vpx_image_t *img,
|
||||
const vpx_image_t *shifted,
|
||||
vpx_img_fmt_t required_fmt) {
|
||||
return img->d_w != shifted->d_w ||
|
||||
img->d_h != shifted->d_h ||
|
||||
return img->d_w != shifted->d_w || img->d_h != shifted->d_h ||
|
||||
required_fmt != shifted->fmt;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int main_loop(int argc, const char **argv_) {
|
||||
vpx_codec_ctx_t decoder;
|
||||
char *fn = NULL;
|
||||
int i;
|
||||
uint8_t *buf = NULL;
|
||||
size_t bytes_in_buffer = 0, buffer_size = 0;
|
||||
FILE *infile;
|
||||
int frame_in = 0, frame_out = 0, flipuv = 0, noblit = 0;
|
||||
int do_md5 = 0, progress = 0, frame_parallel = 0;
|
||||
int stop_after = 0, postproc = 0, summary = 0, quiet = 1;
|
||||
int arg_skip = 0;
|
||||
int ec_enabled = 0;
|
||||
int keep_going = 0;
|
||||
vpx_codec_ctx_t decoder;
|
||||
char *fn = NULL;
|
||||
int i;
|
||||
uint8_t *buf = NULL;
|
||||
size_t bytes_in_buffer = 0, buffer_size = 0;
|
||||
FILE *infile;
|
||||
int frame_in = 0, frame_out = 0, flipuv = 0, noblit = 0;
|
||||
int do_md5 = 0, progress = 0, frame_parallel = 0;
|
||||
int stop_after = 0, postproc = 0, summary = 0, quiet = 1;
|
||||
int arg_skip = 0;
|
||||
int ec_enabled = 0;
|
||||
int keep_going = 0;
|
||||
const VpxInterface *interface = NULL;
|
||||
const VpxInterface *fourcc_interface = NULL;
|
||||
uint64_t dx_time = 0;
|
||||
struct arg arg;
|
||||
char **argv, **argi, **argj;
|
||||
struct arg arg;
|
||||
char **argv, **argi, **argj;
|
||||
|
||||
int single_file;
|
||||
int use_y4m = 1;
|
||||
int opt_yv12 = 0;
|
||||
int opt_i420 = 0;
|
||||
vpx_codec_dec_cfg_t cfg = {0, 0, 0};
|
||||
int single_file;
|
||||
int use_y4m = 1;
|
||||
int opt_yv12 = 0;
|
||||
int opt_i420 = 0;
|
||||
vpx_codec_dec_cfg_t cfg = { 0, 0, 0 };
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
unsigned int output_bit_depth = 0;
|
||||
unsigned int output_bit_depth = 0;
|
||||
#endif
|
||||
#if CONFIG_EXT_TILE
|
||||
int tile_row = -1;
|
||||
int tile_col = -1;
|
||||
int tile_row = -1;
|
||||
int tile_col = -1;
|
||||
#endif // CONFIG_EXT_TILE
|
||||
int frames_corrupted = 0;
|
||||
int dec_flags = 0;
|
||||
int do_scale = 0;
|
||||
vpx_image_t *scaled_img = NULL;
|
||||
int frames_corrupted = 0;
|
||||
int dec_flags = 0;
|
||||
int do_scale = 0;
|
||||
vpx_image_t *scaled_img = NULL;
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
vpx_image_t *img_shifted = NULL;
|
||||
vpx_image_t *img_shifted = NULL;
|
||||
#endif
|
||||
int frame_avail, got_data, flush_decoder = 0;
|
||||
int num_external_frame_buffers = 0;
|
||||
struct ExternalFrameBufferList ext_fb_list = {0, NULL};
|
||||
int frame_avail, got_data, flush_decoder = 0;
|
||||
int num_external_frame_buffers = 0;
|
||||
struct ExternalFrameBufferList ext_fb_list = { 0, NULL };
|
||||
|
||||
const char *outfile_pattern = NULL;
|
||||
char outfile_name[PATH_MAX] = {0};
|
||||
char outfile_name[PATH_MAX] = { 0 };
|
||||
FILE *outfile = NULL;
|
||||
|
||||
MD5Context md5_ctx;
|
||||
unsigned char md5_digest[16];
|
||||
|
||||
struct VpxDecInputContext input = {NULL, NULL};
|
||||
struct VpxDecInputContext input = { NULL, NULL };
|
||||
struct VpxInputContext vpx_input_ctx;
|
||||
#if CONFIG_WEBM_IO
|
||||
struct WebmInputContext webm_ctx;
|
||||
|
@ -702,7 +672,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
|
||||
if (use_y4m && !noblit) {
|
||||
if (!single_file) {
|
||||
fprintf(stderr, "YUV4MPEG2 not supported with output patterns,"
|
||||
fprintf(stderr,
|
||||
"YUV4MPEG2 not supported with output patterns,"
|
||||
" try --i420 or --yv12 or --rawvideo.\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
@ -710,7 +681,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
#if CONFIG_WEBM_IO
|
||||
if (vpx_input_ctx.file_type == FILE_TYPE_WEBM) {
|
||||
if (webm_guess_framerate(input.webm_ctx, input.vpx_input_ctx)) {
|
||||
fprintf(stderr, "Failed to guess framerate -- error parsing "
|
||||
fprintf(stderr,
|
||||
"Failed to guess framerate -- error parsing "
|
||||
"webm file?\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
@ -724,21 +696,19 @@ static int main_loop(int argc, const char **argv_) {
|
|||
else
|
||||
interface = fourcc_interface;
|
||||
|
||||
if (!interface)
|
||||
interface = get_vpx_decoder_by_index(0);
|
||||
if (!interface) interface = get_vpx_decoder_by_index(0);
|
||||
|
||||
dec_flags = (postproc ? VPX_CODEC_USE_POSTPROC : 0) |
|
||||
(ec_enabled ? VPX_CODEC_USE_ERROR_CONCEALMENT : 0) |
|
||||
(frame_parallel ? VPX_CODEC_USE_FRAME_THREADING : 0);
|
||||
if (vpx_codec_dec_init(&decoder, interface->codec_interface(),
|
||||
&cfg, dec_flags)) {
|
||||
if (vpx_codec_dec_init(&decoder, interface->codec_interface(), &cfg,
|
||||
dec_flags)) {
|
||||
fprintf(stderr, "Failed to initialize decoder: %s\n",
|
||||
vpx_codec_error(&decoder));
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (!quiet)
|
||||
fprintf(stderr, "%s\n", decoder.name);
|
||||
if (!quiet) fprintf(stderr, "%s\n", decoder.name);
|
||||
|
||||
#if CONFIG_VP10_DECODER && CONFIG_EXT_TILE
|
||||
if (strncmp(decoder.name, "WebM Project VP10", 17) == 0) {
|
||||
|
@ -756,11 +726,9 @@ static int main_loop(int argc, const char **argv_) {
|
|||
}
|
||||
#endif
|
||||
|
||||
if (arg_skip)
|
||||
fprintf(stderr, "Skipping first %d frames.\n", arg_skip);
|
||||
if (arg_skip) fprintf(stderr, "Skipping first %d frames.\n", arg_skip);
|
||||
while (arg_skip) {
|
||||
if (read_frame(&input, &buf, &bytes_in_buffer, &buffer_size))
|
||||
break;
|
||||
if (read_frame(&input, &buf, &bytes_in_buffer, &buffer_size)) break;
|
||||
arg_skip--;
|
||||
}
|
||||
|
||||
|
@ -768,9 +736,9 @@ static int main_loop(int argc, const char **argv_) {
|
|||
ext_fb_list.num_external_frame_buffers = num_external_frame_buffers;
|
||||
ext_fb_list.ext_fb = (struct ExternalFrameBuffer *)calloc(
|
||||
num_external_frame_buffers, sizeof(*ext_fb_list.ext_fb));
|
||||
if (vpx_codec_set_frame_buffer_functions(
|
||||
&decoder, get_vp9_frame_buffer, release_vp9_frame_buffer,
|
||||
&ext_fb_list)) {
|
||||
if (vpx_codec_set_frame_buffer_functions(&decoder, get_vp9_frame_buffer,
|
||||
release_vp9_frame_buffer,
|
||||
&ext_fb_list)) {
|
||||
fprintf(stderr, "Failed to configure external frame buffers: %s\n",
|
||||
vpx_codec_error(&decoder));
|
||||
return EXIT_FAILURE;
|
||||
|
@ -782,10 +750,10 @@ static int main_loop(int argc, const char **argv_) {
|
|||
|
||||
/* Decode file */
|
||||
while (frame_avail || got_data) {
|
||||
vpx_codec_iter_t iter = NULL;
|
||||
vpx_image_t *img;
|
||||
vpx_codec_iter_t iter = NULL;
|
||||
vpx_image_t *img;
|
||||
struct vpx_usec_timer timer;
|
||||
int corrupted = 0;
|
||||
int corrupted = 0;
|
||||
|
||||
frame_avail = 0;
|
||||
if (!stop_after || frame_in < stop_after) {
|
||||
|
@ -795,16 +763,14 @@ static int main_loop(int argc, const char **argv_) {
|
|||
|
||||
vpx_usec_timer_start(&timer);
|
||||
|
||||
if (vpx_codec_decode(&decoder, buf, (unsigned int)bytes_in_buffer,
|
||||
NULL, 0)) {
|
||||
if (vpx_codec_decode(&decoder, buf, (unsigned int)bytes_in_buffer, NULL,
|
||||
0)) {
|
||||
const char *detail = vpx_codec_error_detail(&decoder);
|
||||
warn("Failed to decode frame %d: %s",
|
||||
frame_in, vpx_codec_error(&decoder));
|
||||
warn("Failed to decode frame %d: %s", frame_in,
|
||||
vpx_codec_error(&decoder));
|
||||
|
||||
if (detail)
|
||||
warn("Additional information: %s", detail);
|
||||
if (!keep_going)
|
||||
goto fail;
|
||||
if (detail) warn("Additional information: %s", detail);
|
||||
if (!keep_going) goto fail;
|
||||
}
|
||||
|
||||
vpx_usec_timer_mark(&timer);
|
||||
|
@ -837,17 +803,15 @@ static int main_loop(int argc, const char **argv_) {
|
|||
if (!frame_parallel &&
|
||||
vpx_codec_control(&decoder, VP8D_GET_FRAME_CORRUPTED, &corrupted)) {
|
||||
warn("Failed VP8_GET_FRAME_CORRUPTED: %s", vpx_codec_error(&decoder));
|
||||
if (!keep_going)
|
||||
goto fail;
|
||||
if (!keep_going) goto fail;
|
||||
}
|
||||
frames_corrupted += corrupted;
|
||||
|
||||
if (progress)
|
||||
show_progress(frame_in, frame_out, dx_time);
|
||||
if (progress) show_progress(frame_in, frame_out, dx_time);
|
||||
|
||||
if (!noblit && img) {
|
||||
const int PLANES_YUV[] = {VPX_PLANE_Y, VPX_PLANE_U, VPX_PLANE_V};
|
||||
const int PLANES_YVU[] = {VPX_PLANE_Y, VPX_PLANE_V, VPX_PLANE_U};
|
||||
const int PLANES_YUV[] = { VPX_PLANE_Y, VPX_PLANE_U, VPX_PLANE_V };
|
||||
const int PLANES_YVU[] = { VPX_PLANE_Y, VPX_PLANE_V, VPX_PLANE_U };
|
||||
const int *planes = flipuv ? PLANES_YVU : PLANES_YUV;
|
||||
|
||||
if (do_scale) {
|
||||
|
@ -871,8 +835,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
render_height = render_size[1];
|
||||
}
|
||||
}
|
||||
scaled_img = vpx_img_alloc(NULL, img->fmt, render_width,
|
||||
render_height, 16);
|
||||
scaled_img =
|
||||
vpx_img_alloc(NULL, img->fmt, render_width, render_height, 16);
|
||||
scaled_img->bit_depth = img->bit_depth;
|
||||
}
|
||||
|
||||
|
@ -881,7 +845,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
libyuv_scale(img, scaled_img, kFilterBox);
|
||||
img = scaled_img;
|
||||
#else
|
||||
fprintf(stderr, "Failed to scale output frame: %s.\n"
|
||||
fprintf(stderr,
|
||||
"Failed to scale output frame: %s.\n"
|
||||
"Scaling is disabled in this configuration. "
|
||||
"To enable scaling, configure with --enable-libyuv\n",
|
||||
vpx_codec_error(&decoder));
|
||||
|
@ -896,22 +861,22 @@ static int main_loop(int argc, const char **argv_) {
|
|||
}
|
||||
// Shift up or down if necessary
|
||||
if (output_bit_depth != 0 && output_bit_depth != img->bit_depth) {
|
||||
const vpx_img_fmt_t shifted_fmt = output_bit_depth == 8 ?
|
||||
img->fmt ^ (img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) :
|
||||
img->fmt | VPX_IMG_FMT_HIGHBITDEPTH;
|
||||
const vpx_img_fmt_t shifted_fmt =
|
||||
output_bit_depth == 8
|
||||
? img->fmt ^ (img->fmt & VPX_IMG_FMT_HIGHBITDEPTH)
|
||||
: img->fmt | VPX_IMG_FMT_HIGHBITDEPTH;
|
||||
if (img_shifted &&
|
||||
img_shifted_realloc_required(img, img_shifted, shifted_fmt)) {
|
||||
vpx_img_free(img_shifted);
|
||||
img_shifted = NULL;
|
||||
}
|
||||
if (!img_shifted) {
|
||||
img_shifted = vpx_img_alloc(NULL, shifted_fmt,
|
||||
img->d_w, img->d_h, 16);
|
||||
img_shifted =
|
||||
vpx_img_alloc(NULL, shifted_fmt, img->d_w, img->d_h, 16);
|
||||
img_shifted->bit_depth = output_bit_depth;
|
||||
}
|
||||
if (output_bit_depth > img->bit_depth) {
|
||||
vpx_img_upshift(img_shifted, img,
|
||||
output_bit_depth - img->bit_depth);
|
||||
vpx_img_upshift(img_shifted, img, output_bit_depth - img->bit_depth);
|
||||
} else {
|
||||
vpx_img_downshift(img_shifted, img,
|
||||
img->bit_depth - output_bit_depth);
|
||||
|
@ -927,7 +892,7 @@ static int main_loop(int argc, const char **argv_) {
|
|||
|
||||
if (single_file) {
|
||||
if (use_y4m) {
|
||||
char buf[Y4M_BUFFER_SIZE] = {0};
|
||||
char buf[Y4M_BUFFER_SIZE] = { 0 };
|
||||
size_t len = 0;
|
||||
if (img->fmt == VPX_IMG_FMT_I440 || img->fmt == VPX_IMG_FMT_I44016) {
|
||||
fprintf(stderr, "Cannot produce y4m output for 440 sampling.\n");
|
||||
|
@ -935,11 +900,9 @@ static int main_loop(int argc, const char **argv_) {
|
|||
}
|
||||
if (frame_out == 1) {
|
||||
// Y4M file header
|
||||
len = y4m_write_file_header(buf, sizeof(buf),
|
||||
vpx_input_ctx.width,
|
||||
vpx_input_ctx.height,
|
||||
&vpx_input_ctx.framerate,
|
||||
img->fmt, img->bit_depth);
|
||||
len = y4m_write_file_header(
|
||||
buf, sizeof(buf), vpx_input_ctx.width, vpx_input_ctx.height,
|
||||
&vpx_input_ctx.framerate, img->fmt, img->bit_depth);
|
||||
if (do_md5) {
|
||||
MD5Update(&md5_ctx, (md5byte *)buf, (unsigned int)len);
|
||||
} else {
|
||||
|
@ -967,7 +930,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
}
|
||||
if (opt_yv12) {
|
||||
if ((img->fmt != VPX_IMG_FMT_I420 &&
|
||||
img->fmt != VPX_IMG_FMT_YV12) || img->bit_depth != 8) {
|
||||
img->fmt != VPX_IMG_FMT_YV12) ||
|
||||
img->bit_depth != 8) {
|
||||
fprintf(stderr, "Cannot produce yv12 output for bit-stream.\n");
|
||||
goto fail;
|
||||
}
|
||||
|
@ -981,8 +945,8 @@ static int main_loop(int argc, const char **argv_) {
|
|||
write_image_file(img, planes, outfile);
|
||||
}
|
||||
} else {
|
||||
generate_filename(outfile_pattern, outfile_name, PATH_MAX,
|
||||
img->d_w, img->d_h, frame_in);
|
||||
generate_filename(outfile_pattern, outfile_name, PATH_MAX, img->d_w,
|
||||
img->d_h, frame_in);
|
||||
if (do_md5) {
|
||||
MD5Init(&md5_ctx);
|
||||
update_image_md5(img, planes, &md5_ctx);
|
||||
|
@ -1027,8 +991,7 @@ fail:
|
|||
webm_free(input.webm_ctx);
|
||||
#endif
|
||||
|
||||
if (input.vpx_input_ctx->file_type != FILE_TYPE_WEBM)
|
||||
free(buf);
|
||||
if (input.vpx_input_ctx->file_type != FILE_TYPE_WEBM) free(buf);
|
||||
|
||||
if (scaled_img) vpx_img_free(scaled_img);
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
|
@ -1063,7 +1026,6 @@ int main(int argc, const char **argv_) {
|
|||
}
|
||||
}
|
||||
free(argv);
|
||||
for (i = 0; !error && i < loops; i++)
|
||||
error = main_loop(argc, argv_);
|
||||
for (i = 0; !error && i < loops; i++) error = main_loop(argc, argv_);
|
||||
return error;
|
||||
}
|
||||
|
|
1065
vpxenc.c
1065
vpxenc.c
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
16
vpxstats.c
16
vpxstats.c
|
@ -30,8 +30,7 @@ int stats_open_file(stats_io_t *stats, const char *fpf, int pass) {
|
|||
|
||||
stats->file = fopen(fpf, "rb");
|
||||
|
||||
if (stats->file == NULL)
|
||||
fatal("First-pass stats file does not exist!");
|
||||
if (stats->file == NULL) fatal("First-pass stats file does not exist!");
|
||||
|
||||
if (fseek(stats->file, 0, SEEK_END))
|
||||
fatal("First-pass stats file must be seekable!");
|
||||
|
@ -76,18 +75,17 @@ void stats_close(stats_io_t *stats, int last_pass) {
|
|||
fclose(stats->file);
|
||||
stats->file = NULL;
|
||||
} else {
|
||||
if (stats->pass == last_pass)
|
||||
free(stats->buf.buf);
|
||||
if (stats->pass == last_pass) free(stats->buf.buf);
|
||||
}
|
||||
}
|
||||
|
||||
void stats_write(stats_io_t *stats, const void *pkt, size_t len) {
|
||||
if (stats->file) {
|
||||
(void) fwrite(pkt, 1, len, stats->file);
|
||||
(void)fwrite(pkt, 1, len, stats->file);
|
||||
} else {
|
||||
if (stats->buf.sz + len > stats->buf_alloc_sz) {
|
||||
size_t new_sz = stats->buf_alloc_sz + 64 * 1024;
|
||||
char *new_ptr = realloc(stats->buf.buf, new_sz);
|
||||
size_t new_sz = stats->buf_alloc_sz + 64 * 1024;
|
||||
char *new_ptr = realloc(stats->buf.buf, new_sz);
|
||||
|
||||
if (new_ptr) {
|
||||
stats->buf_ptr = new_ptr + (stats->buf_ptr - (char *)stats->buf.buf);
|
||||
|
@ -104,6 +102,4 @@ void stats_write(stats_io_t *stats, const void *pkt, size_t len) {
|
|||
}
|
||||
}
|
||||
|
||||
vpx_fixed_buf_t stats_get(stats_io_t *stats) {
|
||||
return stats->buf;
|
||||
}
|
||||
vpx_fixed_buf_t stats_get(stats_io_t *stats) { return stats->buf; }
|
||||
|
|
24
warnings.c
24
warnings.c
|
@ -47,8 +47,7 @@ static void add_warning(const char *warning_string,
|
|||
new_node->warning_string = warning_string;
|
||||
new_node->next_warning = NULL;
|
||||
|
||||
while (*node != NULL)
|
||||
node = &(*node)->next_warning;
|
||||
while (*node != NULL) node = &(*node)->next_warning;
|
||||
|
||||
*node = new_node;
|
||||
}
|
||||
|
@ -78,9 +77,7 @@ static void check_quantizer(int min_q, int max_q,
|
|||
}
|
||||
|
||||
static void check_lag_in_frames_realtime_deadline(
|
||||
int lag_in_frames,
|
||||
int deadline,
|
||||
struct WarningList *warning_list) {
|
||||
int lag_in_frames, int deadline, struct WarningList *warning_list) {
|
||||
if (deadline == VPX_DL_REALTIME && lag_in_frames != 0)
|
||||
add_warning(lag_in_frames_with_realtime, warning_list);
|
||||
}
|
||||
|
@ -90,26 +87,21 @@ void check_encoder_config(int disable_prompt,
|
|||
const struct vpx_codec_enc_cfg *stream_config) {
|
||||
int num_warnings = 0;
|
||||
struct WarningListNode *warning = NULL;
|
||||
struct WarningList warning_list = {0};
|
||||
struct WarningList warning_list = { 0 };
|
||||
|
||||
check_quantizer(stream_config->rc_min_quantizer,
|
||||
stream_config->rc_max_quantizer,
|
||||
&warning_list);
|
||||
stream_config->rc_max_quantizer, &warning_list);
|
||||
check_lag_in_frames_realtime_deadline(stream_config->g_lag_in_frames,
|
||||
global_config->deadline,
|
||||
&warning_list);
|
||||
global_config->deadline, &warning_list);
|
||||
/* Count and print warnings. */
|
||||
for (warning = warning_list.warning_node;
|
||||
warning != NULL;
|
||||
warning = warning->next_warning,
|
||||
++num_warnings) {
|
||||
for (warning = warning_list.warning_node; warning != NULL;
|
||||
warning = warning->next_warning, ++num_warnings) {
|
||||
warn(warning->warning_string);
|
||||
}
|
||||
|
||||
free_warning_list(&warning_list);
|
||||
|
||||
if (num_warnings) {
|
||||
if (!disable_prompt && !continue_prompt(num_warnings))
|
||||
exit(EXIT_FAILURE);
|
||||
if (!disable_prompt && !continue_prompt(num_warnings)) exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -52,8 +52,7 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
|
|||
// 0 - Success
|
||||
// 1 - End of Stream
|
||||
// -1 - Error
|
||||
int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
uint8_t **buffer,
|
||||
int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer,
|
||||
size_t *buffer_size);
|
||||
|
||||
// Guesses the frame rate of the input file based on the container timestamps.
|
||||
|
|
|
@ -40,8 +40,7 @@ typedef enum stereo_format {
|
|||
void write_webm_file_header(struct WebmOutputContext *webm_ctx,
|
||||
const vpx_codec_enc_cfg_t *cfg,
|
||||
const struct vpx_rational *fps,
|
||||
stereo_format_t stereo_fmt,
|
||||
unsigned int fourcc,
|
||||
stereo_format_t stereo_fmt, unsigned int fourcc,
|
||||
const struct VpxRational *par);
|
||||
|
||||
void write_webm_block(struct WebmOutputContext *webm_ctx,
|
||||
|
|
48
y4menc.c
48
y4menc.c
|
@ -17,39 +17,43 @@ int y4m_write_file_header(char *buf, size_t len, int width, int height,
|
|||
const char *color;
|
||||
switch (bit_depth) {
|
||||
case 8:
|
||||
color = fmt == VPX_IMG_FMT_444A ? "C444alpha\n" :
|
||||
fmt == VPX_IMG_FMT_I444 ? "C444\n" :
|
||||
fmt == VPX_IMG_FMT_I422 ? "C422\n" :
|
||||
"C420jpeg\n";
|
||||
color = fmt == VPX_IMG_FMT_444A
|
||||
? "C444alpha\n"
|
||||
: fmt == VPX_IMG_FMT_I444 ? "C444\n" : fmt == VPX_IMG_FMT_I422
|
||||
? "C422\n"
|
||||
: "C420jpeg\n";
|
||||
break;
|
||||
case 9:
|
||||
color = fmt == VPX_IMG_FMT_I44416 ? "C444p9 XYSCSS=444P9\n" :
|
||||
fmt == VPX_IMG_FMT_I42216 ? "C422p9 XYSCSS=422P9\n" :
|
||||
"C420p9 XYSCSS=420P9\n";
|
||||
color = fmt == VPX_IMG_FMT_I44416
|
||||
? "C444p9 XYSCSS=444P9\n"
|
||||
: fmt == VPX_IMG_FMT_I42216 ? "C422p9 XYSCSS=422P9\n"
|
||||
: "C420p9 XYSCSS=420P9\n";
|
||||
break;
|
||||
case 10:
|
||||
color = fmt == VPX_IMG_FMT_I44416 ? "C444p10 XYSCSS=444P10\n" :
|
||||
fmt == VPX_IMG_FMT_I42216 ? "C422p10 XYSCSS=422P10\n" :
|
||||
"C420p10 XYSCSS=420P10\n";
|
||||
color = fmt == VPX_IMG_FMT_I44416
|
||||
? "C444p10 XYSCSS=444P10\n"
|
||||
: fmt == VPX_IMG_FMT_I42216 ? "C422p10 XYSCSS=422P10\n"
|
||||
: "C420p10 XYSCSS=420P10\n";
|
||||
break;
|
||||
case 12:
|
||||
color = fmt == VPX_IMG_FMT_I44416 ? "C444p12 XYSCSS=444P12\n" :
|
||||
fmt == VPX_IMG_FMT_I42216 ? "C422p12 XYSCSS=422P12\n" :
|
||||
"C420p12 XYSCSS=420P12\n";
|
||||
color = fmt == VPX_IMG_FMT_I44416
|
||||
? "C444p12 XYSCSS=444P12\n"
|
||||
: fmt == VPX_IMG_FMT_I42216 ? "C422p12 XYSCSS=422P12\n"
|
||||
: "C420p12 XYSCSS=420P12\n";
|
||||
break;
|
||||
case 14:
|
||||
color = fmt == VPX_IMG_FMT_I44416 ? "C444p14 XYSCSS=444P14\n" :
|
||||
fmt == VPX_IMG_FMT_I42216 ? "C422p14 XYSCSS=422P14\n" :
|
||||
"C420p14 XYSCSS=420P14\n";
|
||||
color = fmt == VPX_IMG_FMT_I44416
|
||||
? "C444p14 XYSCSS=444P14\n"
|
||||
: fmt == VPX_IMG_FMT_I42216 ? "C422p14 XYSCSS=422P14\n"
|
||||
: "C420p14 XYSCSS=420P14\n";
|
||||
break;
|
||||
case 16:
|
||||
color = fmt == VPX_IMG_FMT_I44416 ? "C444p16 XYSCSS=444P16\n" :
|
||||
fmt == VPX_IMG_FMT_I42216 ? "C422p16 XYSCSS=422P16\n" :
|
||||
"C420p16 XYSCSS=420P16\n";
|
||||
color = fmt == VPX_IMG_FMT_I44416
|
||||
? "C444p16 XYSCSS=444P16\n"
|
||||
: fmt == VPX_IMG_FMT_I42216 ? "C422p16 XYSCSS=422P16\n"
|
||||
: "C420p16 XYSCSS=420P16\n";
|
||||
break;
|
||||
default:
|
||||
color = NULL;
|
||||
assert(0);
|
||||
default: color = NULL; assert(0);
|
||||
}
|
||||
return snprintf(buf, len, "YUV4MPEG2 W%u H%u F%u:%u I%c %s", width, height,
|
||||
framerate->numerator, framerate->denominator, 'p', color);
|
||||
|
|
415
y4minput.c
415
y4minput.c
|
@ -25,7 +25,7 @@ static int file_read(void *buf, size_t size, FILE *file) {
|
|||
int file_error;
|
||||
size_t len = 0;
|
||||
do {
|
||||
const size_t n = fread((uint8_t*)buf + len, 1, size - len, file);
|
||||
const size_t n = fread((uint8_t *)buf + len, 1, size - len, file);
|
||||
len += n;
|
||||
file_error = ferror(file);
|
||||
if (file_error) {
|
||||
|
@ -41,21 +41,22 @@ static int file_read(void *buf, size_t size, FILE *file) {
|
|||
} while (!feof(file) && len < size && ++retry_count < kMaxRetries);
|
||||
|
||||
if (!feof(file) && len != size) {
|
||||
fprintf(stderr, "Error reading file: %u of %u bytes read,"
|
||||
" error: %d, retries: %d, %d: %s\n",
|
||||
(uint32_t)len, (uint32_t)size, file_error, retry_count,
|
||||
errno, strerror(errno));
|
||||
fprintf(stderr,
|
||||
"Error reading file: %u of %u bytes read,"
|
||||
" error: %d, retries: %d, %d: %s\n",
|
||||
(uint32_t)len, (uint32_t)size, file_error, retry_count, errno,
|
||||
strerror(errno));
|
||||
}
|
||||
return len == size;
|
||||
}
|
||||
|
||||
static int y4m_parse_tags(y4m_input *_y4m, char *_tags) {
|
||||
int got_w;
|
||||
int got_h;
|
||||
int got_fps;
|
||||
int got_interlace;
|
||||
int got_par;
|
||||
int got_chroma;
|
||||
int got_w;
|
||||
int got_h;
|
||||
int got_fps;
|
||||
int got_interlace;
|
||||
int got_par;
|
||||
int got_chroma;
|
||||
char *p;
|
||||
char *q;
|
||||
got_w = got_h = got_fps = got_interlace = got_par = got_chroma = 0;
|
||||
|
@ -70,55 +71,47 @@ static int y4m_parse_tags(y4m_input *_y4m, char *_tags) {
|
|||
/*Process the tag.*/
|
||||
switch (p[0]) {
|
||||
case 'W': {
|
||||
if (sscanf(p + 1, "%d", &_y4m->pic_w) != 1)return -1;
|
||||
if (sscanf(p + 1, "%d", &_y4m->pic_w) != 1) return -1;
|
||||
got_w = 1;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 'H': {
|
||||
if (sscanf(p + 1, "%d", &_y4m->pic_h) != 1)return -1;
|
||||
if (sscanf(p + 1, "%d", &_y4m->pic_h) != 1) return -1;
|
||||
got_h = 1;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 'F': {
|
||||
if (sscanf(p + 1, "%d:%d", &_y4m->fps_n, &_y4m->fps_d) != 2) {
|
||||
return -1;
|
||||
}
|
||||
got_fps = 1;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 'I': {
|
||||
_y4m->interlace = p[1];
|
||||
got_interlace = 1;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 'A': {
|
||||
if (sscanf(p + 1, "%d:%d", &_y4m->par_n, &_y4m->par_d) != 2) {
|
||||
return -1;
|
||||
}
|
||||
got_par = 1;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 'C': {
|
||||
if (q - p > 16)return -1;
|
||||
if (q - p > 16) return -1;
|
||||
memcpy(_y4m->chroma_type, p + 1, q - p - 1);
|
||||
_y4m->chroma_type[q - p - 1] = '\0';
|
||||
got_chroma = 1;
|
||||
}
|
||||
break;
|
||||
/*Ignore unknown tags.*/
|
||||
} break;
|
||||
/*Ignore unknown tags.*/
|
||||
}
|
||||
}
|
||||
if (!got_w || !got_h || !got_fps)return -1;
|
||||
if (!got_interlace)_y4m->interlace = '?';
|
||||
if (!got_par)_y4m->par_n = _y4m->par_d = 0;
|
||||
if (!got_w || !got_h || !got_fps) return -1;
|
||||
if (!got_interlace) _y4m->interlace = '?';
|
||||
if (!got_par) _y4m->par_n = _y4m->par_d = 0;
|
||||
/*Chroma-type is not specified in older files, e.g., those generated by
|
||||
mplayer.*/
|
||||
if (!got_chroma)strcpy(_y4m->chroma_type, "420");
|
||||
if (!got_chroma) strcpy(_y4m->chroma_type, "420");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*All anti-aliasing filters in the following conversion functions are based on
|
||||
one of two window functions:
|
||||
The 6-tap Lanczos window (for down-sampling and shifts):
|
||||
|
@ -141,9 +134,9 @@ static int y4m_parse_tags(y4m_input *_y4m, char *_tags) {
|
|||
have these steps pipelined, for less memory consumption and better cache
|
||||
performance, but we do them separately for simplicity.*/
|
||||
|
||||
#define OC_MINI(_a,_b) ((_a)>(_b)?(_b):(_a))
|
||||
#define OC_MAXI(_a,_b) ((_a)<(_b)?(_b):(_a))
|
||||
#define OC_CLAMPI(_a,_b,_c) (OC_MAXI(_a,OC_MINI(_b,_c)))
|
||||
#define OC_MINI(_a, _b) ((_a) > (_b) ? (_b) : (_a))
|
||||
#define OC_MAXI(_a, _b) ((_a) < (_b) ? (_b) : (_a))
|
||||
#define OC_CLAMPI(_a, _b, _c) (OC_MAXI(_a, OC_MINI(_b, _c)))
|
||||
|
||||
/*420jpeg chroma samples are sited like:
|
||||
Y-------Y-------Y-------Y-------
|
||||
|
@ -187,25 +180,36 @@ static int y4m_parse_tags(y4m_input *_y4m, char *_tags) {
|
|||
lines, and they are vertically co-sited with the luma samples in both the
|
||||
mpeg2 and jpeg cases (thus requiring no vertical resampling).*/
|
||||
static void y4m_42xmpeg2_42xjpeg_helper(unsigned char *_dst,
|
||||
const unsigned char *_src, int _c_w, int _c_h) {
|
||||
const unsigned char *_src, int _c_w,
|
||||
int _c_h) {
|
||||
int y;
|
||||
int x;
|
||||
for (y = 0; y < _c_h; y++) {
|
||||
/*Filter: [4 -17 114 35 -9 1]/128, derived from a 6-tap Lanczos
|
||||
window.*/
|
||||
for (x = 0; x < OC_MINI(_c_w, 2); x++) {
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(0, (4 * _src[0] - 17 * _src[OC_MAXI(x - 1, 0)] +
|
||||
114 * _src[x] + 35 * _src[OC_MINI(x + 1, _c_w - 1)] - 9 * _src[OC_MINI(x + 2, _c_w - 1)] +
|
||||
_src[OC_MINI(x + 3, _c_w - 1)] + 64) >> 7, 255);
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(
|
||||
0, (4 * _src[0] - 17 * _src[OC_MAXI(x - 1, 0)] + 114 * _src[x] +
|
||||
35 * _src[OC_MINI(x + 1, _c_w - 1)] -
|
||||
9 * _src[OC_MINI(x + 2, _c_w - 1)] +
|
||||
_src[OC_MINI(x + 3, _c_w - 1)] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < _c_w - 3; x++) {
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(0, (4 * _src[x - 2] - 17 * _src[x - 1] +
|
||||
114 * _src[x] + 35 * _src[x + 1] - 9 * _src[x + 2] + _src[x + 3] + 64) >> 7, 255);
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(
|
||||
0, (4 * _src[x - 2] - 17 * _src[x - 1] + 114 * _src[x] +
|
||||
35 * _src[x + 1] - 9 * _src[x + 2] + _src[x + 3] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < _c_w; x++) {
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(0, (4 * _src[x - 2] - 17 * _src[x - 1] +
|
||||
114 * _src[x] + 35 * _src[OC_MINI(x + 1, _c_w - 1)] - 9 * _src[OC_MINI(x + 2, _c_w - 1)] +
|
||||
_src[_c_w - 1] + 64) >> 7, 255);
|
||||
_dst[x] = (unsigned char)OC_CLAMPI(
|
||||
0, (4 * _src[x - 2] - 17 * _src[x - 1] + 114 * _src[x] +
|
||||
35 * _src[OC_MINI(x + 1, _c_w - 1)] -
|
||||
9 * _src[OC_MINI(x + 2, _c_w - 1)] + _src[_c_w - 1] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
_dst += _c_w;
|
||||
_src += _c_w;
|
||||
|
@ -278,12 +282,12 @@ static void y4m_convert_42xmpeg2_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
static void y4m_convert_42xpaldv_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
|
||||
unsigned char *_aux) {
|
||||
unsigned char *tmp;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
/*Skip past the luma data.*/
|
||||
_dst += _y4m->pic_w * _y4m->pic_h;
|
||||
/*Compute the size of each chroma plane.*/
|
||||
|
@ -303,53 +307,73 @@ static void y4m_convert_42xpaldv_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
This is the same filter used above, but in the other order.*/
|
||||
for (x = 0; x < c_w; x++) {
|
||||
for (y = 0; y < OC_MINI(c_h, 3); y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (tmp[0]
|
||||
- 9 * tmp[OC_MAXI(y - 2, 0) * c_w] + 35 * tmp[OC_MAXI(y - 1, 0) * c_w]
|
||||
+ 114 * tmp[y * c_w] - 17 * tmp[OC_MINI(y + 1, c_h - 1) * c_w]
|
||||
+ 4 * tmp[OC_MINI(y + 2, c_h - 1) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0, (tmp[0] - 9 * tmp[OC_MAXI(y - 2, 0) * c_w] +
|
||||
35 * tmp[OC_MAXI(y - 1, 0) * c_w] + 114 * tmp[y * c_w] -
|
||||
17 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] +
|
||||
4 * tmp[OC_MINI(y + 2, c_h - 1) * c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < c_h - 2; y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (tmp[(y - 3) * c_w]
|
||||
- 9 * tmp[(y - 2) * c_w] + 35 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w]
|
||||
- 17 * tmp[(y + 1) * c_w] + 4 * tmp[(y + 2) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0, (tmp[(y - 3) * c_w] - 9 * tmp[(y - 2) * c_w] +
|
||||
35 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w] -
|
||||
17 * tmp[(y + 1) * c_w] + 4 * tmp[(y + 2) * c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < c_h; y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (tmp[(y - 3) * c_w]
|
||||
- 9 * tmp[(y - 2) * c_w] + 35 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w]
|
||||
- 17 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] + 4 * tmp[(c_h - 1) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0, (tmp[(y - 3) * c_w] - 9 * tmp[(y - 2) * c_w] +
|
||||
35 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w] -
|
||||
17 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] +
|
||||
4 * tmp[(c_h - 1) * c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
_dst++;
|
||||
tmp++;
|
||||
}
|
||||
_dst += c_sz - c_w;
|
||||
tmp -= c_w;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case 2: {
|
||||
/*Slide C_r down a quarter-pel.
|
||||
This is the same as the horizontal filter.*/
|
||||
for (x = 0; x < c_w; x++) {
|
||||
for (y = 0; y < OC_MINI(c_h, 2); y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (4 * tmp[0]
|
||||
- 17 * tmp[OC_MAXI(y - 1, 0) * c_w] + 114 * tmp[y * c_w]
|
||||
+ 35 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] - 9 * tmp[OC_MINI(y + 2, c_h - 1) * c_w]
|
||||
+ tmp[OC_MINI(y + 3, c_h - 1) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0,
|
||||
(4 * tmp[0] - 17 * tmp[OC_MAXI(y - 1, 0) * c_w] +
|
||||
114 * tmp[y * c_w] + 35 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] -
|
||||
9 * tmp[OC_MINI(y + 2, c_h - 1) * c_w] +
|
||||
tmp[OC_MINI(y + 3, c_h - 1) * c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < c_h - 3; y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (4 * tmp[(y - 2) * c_w]
|
||||
- 17 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w] + 35 * tmp[(y + 1) * c_w]
|
||||
- 9 * tmp[(y + 2) * c_w] + tmp[(y + 3) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0, (4 * tmp[(y - 2) * c_w] - 17 * tmp[(y - 1) * c_w] +
|
||||
114 * tmp[y * c_w] + 35 * tmp[(y + 1) * c_w] -
|
||||
9 * tmp[(y + 2) * c_w] + tmp[(y + 3) * c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < c_h; y++) {
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(0, (4 * tmp[(y - 2) * c_w]
|
||||
- 17 * tmp[(y - 1) * c_w] + 114 * tmp[y * c_w] + 35 * tmp[OC_MINI(y + 1, c_h - 1) * c_w]
|
||||
- 9 * tmp[OC_MINI(y + 2, c_h - 1) * c_w] + tmp[(c_h - 1) * c_w] + 64) >> 7, 255);
|
||||
_dst[y * c_w] = (unsigned char)OC_CLAMPI(
|
||||
0,
|
||||
(4 * tmp[(y - 2) * c_w] - 17 * tmp[(y - 1) * c_w] +
|
||||
114 * tmp[y * c_w] + 35 * tmp[OC_MINI(y + 1, c_h - 1) * c_w] -
|
||||
9 * tmp[OC_MINI(y + 2, c_h - 1) * c_w] + tmp[(c_h - 1) * c_w] +
|
||||
64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
_dst++;
|
||||
tmp++;
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
}
|
||||
/*For actual interlaced material, this would have to be done separately on
|
||||
each field, and the shift amounts would be different.
|
||||
|
@ -364,27 +388,37 @@ static void y4m_convert_42xpaldv_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
/*Perform vertical filtering to reduce a single plane from 4:2:2 to 4:2:0.
|
||||
This is used as a helper by several converation routines.*/
|
||||
static void y4m_422jpeg_420jpeg_helper(unsigned char *_dst,
|
||||
const unsigned char *_src, int _c_w, int _c_h) {
|
||||
const unsigned char *_src, int _c_w,
|
||||
int _c_h) {
|
||||
int y;
|
||||
int x;
|
||||
/*Filter: [3 -17 78 78 -17 3]/128, derived from a 6-tap Lanczos window.*/
|
||||
for (x = 0; x < _c_w; x++) {
|
||||
for (y = 0; y < OC_MINI(_c_h, 2); y += 2) {
|
||||
_dst[(y >> 1)*_c_w] = OC_CLAMPI(0, (64 * _src[0]
|
||||
+ 78 * _src[OC_MINI(1, _c_h - 1) * _c_w]
|
||||
- 17 * _src[OC_MINI(2, _c_h - 1) * _c_w]
|
||||
+ 3 * _src[OC_MINI(3, _c_h - 1) * _c_w] + 64) >> 7, 255);
|
||||
_dst[(y >> 1) * _c_w] =
|
||||
OC_CLAMPI(0, (64 * _src[0] + 78 * _src[OC_MINI(1, _c_h - 1) * _c_w] -
|
||||
17 * _src[OC_MINI(2, _c_h - 1) * _c_w] +
|
||||
3 * _src[OC_MINI(3, _c_h - 1) * _c_w] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < _c_h - 3; y += 2) {
|
||||
_dst[(y >> 1)*_c_w] = OC_CLAMPI(0, (3 * (_src[(y - 2) * _c_w] + _src[(y + 3) * _c_w])
|
||||
- 17 * (_src[(y - 1) * _c_w] + _src[(y + 2) * _c_w])
|
||||
+ 78 * (_src[y * _c_w] + _src[(y + 1) * _c_w]) + 64) >> 7, 255);
|
||||
_dst[(y >> 1) * _c_w] =
|
||||
OC_CLAMPI(0, (3 * (_src[(y - 2) * _c_w] + _src[(y + 3) * _c_w]) -
|
||||
17 * (_src[(y - 1) * _c_w] + _src[(y + 2) * _c_w]) +
|
||||
78 * (_src[y * _c_w] + _src[(y + 1) * _c_w]) + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; y < _c_h; y += 2) {
|
||||
_dst[(y >> 1)*_c_w] = OC_CLAMPI(0, (3 * (_src[(y - 2) * _c_w]
|
||||
+ _src[(_c_h - 1) * _c_w]) - 17 * (_src[(y - 1) * _c_w]
|
||||
+ _src[OC_MINI(y + 2, _c_h - 1) * _c_w])
|
||||
+ 78 * (_src[y * _c_w] + _src[OC_MINI(y + 1, _c_h - 1) * _c_w]) + 64) >> 7, 255);
|
||||
_dst[(y >> 1) * _c_w] = OC_CLAMPI(
|
||||
0,
|
||||
(3 * (_src[(y - 2) * _c_w] + _src[(_c_h - 1) * _c_w]) -
|
||||
17 * (_src[(y - 1) * _c_w] + _src[OC_MINI(y + 2, _c_h - 1) * _c_w]) +
|
||||
78 * (_src[y * _c_w] + _src[OC_MINI(y + 1, _c_h - 1) * _c_w]) +
|
||||
64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
_src++;
|
||||
_dst++;
|
||||
|
@ -497,12 +531,12 @@ static void y4m_convert_422jpeg_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
static void y4m_convert_422_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
||||
unsigned char *_aux) {
|
||||
unsigned char *tmp;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int pli;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int pli;
|
||||
/*Skip past the luma data.*/
|
||||
_dst += _y4m->pic_w * _y4m->pic_h;
|
||||
/*Compute the size of each chroma plane.*/
|
||||
|
@ -569,16 +603,16 @@ static void y4m_convert_422_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
static void y4m_convert_411_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
||||
unsigned char *_aux) {
|
||||
unsigned char *tmp;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_w;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int tmp_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_w;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int tmp_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
/*Skip past the luma data.*/
|
||||
_dst += _y4m->pic_w * _y4m->pic_h;
|
||||
/*Compute the size of each chroma plane.*/
|
||||
|
@ -599,23 +633,42 @@ static void y4m_convert_411_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
/*Filters: [1 110 18 -1]/128 and [-3 50 86 -5]/128, both derived from a
|
||||
4-tap Mitchell window.*/
|
||||
for (x = 0; x < OC_MINI(c_w, 1); x++) {
|
||||
tmp[x << 1] = (unsigned char)OC_CLAMPI(0, (111 * _aux[0]
|
||||
+ 18 * _aux[OC_MINI(1, c_w - 1)] - _aux[OC_MINI(2, c_w - 1)] + 64) >> 7, 255);
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(0, (47 * _aux[0]
|
||||
+ 86 * _aux[OC_MINI(1, c_w - 1)] - 5 * _aux[OC_MINI(2, c_w - 1)] + 64) >> 7, 255);
|
||||
tmp[x << 1] = (unsigned char)OC_CLAMPI(
|
||||
0, (111 * _aux[0] + 18 * _aux[OC_MINI(1, c_w - 1)] -
|
||||
_aux[OC_MINI(2, c_w - 1)] + 64) >>
|
||||
7,
|
||||
255);
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(
|
||||
0, (47 * _aux[0] + 86 * _aux[OC_MINI(1, c_w - 1)] -
|
||||
5 * _aux[OC_MINI(2, c_w - 1)] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < c_w - 2; x++) {
|
||||
tmp[x << 1] = (unsigned char)OC_CLAMPI(0, (_aux[x - 1] + 110 * _aux[x]
|
||||
+ 18 * _aux[x + 1] - _aux[x + 2] + 64) >> 7, 255);
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(0, (-3 * _aux[x - 1] + 50 * _aux[x]
|
||||
+ 86 * _aux[x + 1] - 5 * _aux[x + 2] + 64) >> 7, 255);
|
||||
tmp[x << 1] =
|
||||
(unsigned char)OC_CLAMPI(0, (_aux[x - 1] + 110 * _aux[x] +
|
||||
18 * _aux[x + 1] - _aux[x + 2] + 64) >>
|
||||
7,
|
||||
255);
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(
|
||||
0, (-3 * _aux[x - 1] + 50 * _aux[x] + 86 * _aux[x + 1] -
|
||||
5 * _aux[x + 2] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < c_w; x++) {
|
||||
tmp[x << 1] = (unsigned char)OC_CLAMPI(0, (_aux[x - 1] + 110 * _aux[x]
|
||||
+ 18 * _aux[OC_MINI(x + 1, c_w - 1)] - _aux[c_w - 1] + 64) >> 7, 255);
|
||||
tmp[x << 1] = (unsigned char)OC_CLAMPI(
|
||||
0, (_aux[x - 1] + 110 * _aux[x] +
|
||||
18 * _aux[OC_MINI(x + 1, c_w - 1)] - _aux[c_w - 1] + 64) >>
|
||||
7,
|
||||
255);
|
||||
if ((x << 1 | 1) < dst_c_w) {
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(0, (-3 * _aux[x - 1] + 50 * _aux[x]
|
||||
+ 86 * _aux[OC_MINI(x + 1, c_w - 1)] - 5 * _aux[c_w - 1] + 64) >> 7, 255);
|
||||
tmp[x << 1 | 1] = (unsigned char)OC_CLAMPI(
|
||||
0,
|
||||
(-3 * _aux[x - 1] + 50 * _aux[x] +
|
||||
86 * _aux[OC_MINI(x + 1, c_w - 1)] - 5 * _aux[c_w - 1] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
}
|
||||
tmp += dst_c_w;
|
||||
|
@ -632,16 +685,16 @@ static void y4m_convert_411_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
static void y4m_convert_444_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
||||
unsigned char *_aux) {
|
||||
unsigned char *tmp;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_w;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int tmp_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int dst_c_w;
|
||||
int dst_c_h;
|
||||
int dst_c_sz;
|
||||
int tmp_sz;
|
||||
int pli;
|
||||
int y;
|
||||
int x;
|
||||
/*Skip past the luma data.*/
|
||||
_dst += _y4m->pic_w * _y4m->pic_h;
|
||||
/*Compute the size of each chroma plane.*/
|
||||
|
@ -657,18 +710,27 @@ static void y4m_convert_444_420jpeg(y4m_input *_y4m, unsigned char *_dst,
|
|||
/*Filter: [3 -17 78 78 -17 3]/128, derived from a 6-tap Lanczos window.*/
|
||||
for (y = 0; y < c_h; y++) {
|
||||
for (x = 0; x < OC_MINI(c_w, 2); x += 2) {
|
||||
tmp[x >> 1] = OC_CLAMPI(0, (64 * _aux[0] + 78 * _aux[OC_MINI(1, c_w - 1)]
|
||||
- 17 * _aux[OC_MINI(2, c_w - 1)]
|
||||
+ 3 * _aux[OC_MINI(3, c_w - 1)] + 64) >> 7, 255);
|
||||
tmp[x >> 1] =
|
||||
OC_CLAMPI(0, (64 * _aux[0] + 78 * _aux[OC_MINI(1, c_w - 1)] -
|
||||
17 * _aux[OC_MINI(2, c_w - 1)] +
|
||||
3 * _aux[OC_MINI(3, c_w - 1)] + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < c_w - 3; x += 2) {
|
||||
tmp[x >> 1] = OC_CLAMPI(0, (3 * (_aux[x - 2] + _aux[x + 3])
|
||||
- 17 * (_aux[x - 1] + _aux[x + 2]) + 78 * (_aux[x] + _aux[x + 1]) + 64) >> 7, 255);
|
||||
tmp[x >> 1] = OC_CLAMPI(0, (3 * (_aux[x - 2] + _aux[x + 3]) -
|
||||
17 * (_aux[x - 1] + _aux[x + 2]) +
|
||||
78 * (_aux[x] + _aux[x + 1]) + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
for (; x < c_w; x += 2) {
|
||||
tmp[x >> 1] = OC_CLAMPI(0, (3 * (_aux[x - 2] + _aux[c_w - 1]) -
|
||||
17 * (_aux[x - 1] + _aux[OC_MINI(x + 2, c_w - 1)]) +
|
||||
78 * (_aux[x] + _aux[OC_MINI(x + 1, c_w - 1)]) + 64) >> 7, 255);
|
||||
tmp[x >> 1] = OC_CLAMPI(
|
||||
0, (3 * (_aux[x - 2] + _aux[c_w - 1]) -
|
||||
17 * (_aux[x - 1] + _aux[OC_MINI(x + 2, c_w - 1)]) +
|
||||
78 * (_aux[x] + _aux[OC_MINI(x + 1, c_w - 1)]) + 64) >>
|
||||
7,
|
||||
255);
|
||||
}
|
||||
tmp += dst_c_w;
|
||||
_aux += c_w;
|
||||
|
@ -701,9 +763,9 @@ static void y4m_convert_null(y4m_input *_y4m, unsigned char *_dst,
|
|||
|
||||
int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
||||
int only_420) {
|
||||
char buffer[80] = {0};
|
||||
int ret;
|
||||
int i;
|
||||
char buffer[80] = { 0 };
|
||||
int ret;
|
||||
int i;
|
||||
/*Read until newline, or 80 cols, whichever happens first.*/
|
||||
for (i = 0; i < 79; i++) {
|
||||
if (_nskip > 0) {
|
||||
|
@ -712,10 +774,10 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
} else {
|
||||
if (!file_read(buffer + i, 1, _fin)) return -1;
|
||||
}
|
||||
if (buffer[i] == '\n')break;
|
||||
if (buffer[i] == '\n') break;
|
||||
}
|
||||
/*We skipped too much header data.*/
|
||||
if (_nskip > 0)return -1;
|
||||
if (_nskip > 0) return -1;
|
||||
if (i == 79) {
|
||||
fprintf(stderr, "Error parsing header; not a YUV2MPEG2 file?\n");
|
||||
return -1;
|
||||
|
@ -734,10 +796,12 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
return ret;
|
||||
}
|
||||
if (_y4m->interlace == '?') {
|
||||
fprintf(stderr, "Warning: Input video interlacing format unknown; "
|
||||
fprintf(stderr,
|
||||
"Warning: Input video interlacing format unknown; "
|
||||
"assuming progressive scan.\n");
|
||||
} else if (_y4m->interlace != 'p') {
|
||||
fprintf(stderr, "Input video is interlaced; "
|
||||
fprintf(stderr,
|
||||
"Input video is interlaced; "
|
||||
"Only progressive scan handled.\n");
|
||||
return -1;
|
||||
}
|
||||
|
@ -746,9 +810,11 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
_y4m->bit_depth = 8;
|
||||
if (strcmp(_y4m->chroma_type, "420") == 0 ||
|
||||
strcmp(_y4m->chroma_type, "420jpeg") == 0) {
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v = _y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = _y4m->pic_w * _y4m->pic_h
|
||||
+ 2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v =
|
||||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz =
|
||||
_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
/* Natively supported: no conversion required. */
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz = 0;
|
||||
_y4m->convert = y4m_convert_null;
|
||||
|
@ -757,9 +823,9 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
_y4m->dst_c_dec_h = 2;
|
||||
_y4m->src_c_dec_v = 2;
|
||||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = 2 * (_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + 1) / 2) *
|
||||
((_y4m->pic_h + 1) / 2));
|
||||
_y4m->dst_buf_read_sz =
|
||||
2 * (_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2));
|
||||
/* Natively supported: no conversion required. */
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz = 0;
|
||||
_y4m->convert = y4m_convert_null;
|
||||
|
@ -775,9 +841,9 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
_y4m->dst_c_dec_h = 2;
|
||||
_y4m->src_c_dec_v = 2;
|
||||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = 2 * (_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + 1) / 2) *
|
||||
((_y4m->pic_h + 1) / 2));
|
||||
_y4m->dst_buf_read_sz =
|
||||
2 * (_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2));
|
||||
/* Natively supported: no conversion required. */
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz = 0;
|
||||
_y4m->convert = y4m_convert_null;
|
||||
|
@ -789,20 +855,23 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
return -1;
|
||||
}
|
||||
} else if (strcmp(_y4m->chroma_type, "420mpeg2") == 0) {
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v = _y4m->dst_c_dec_v = 2;
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v =
|
||||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = _y4m->pic_w * _y4m->pic_h;
|
||||
/*Chroma filter required: read into the aux buf first.*/
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz =
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
_y4m->convert = y4m_convert_42xmpeg2_42xjpeg;
|
||||
} else if (strcmp(_y4m->chroma_type, "420paldv") == 0) {
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v = _y4m->dst_c_dec_v = 2;
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = _y4m->src_c_dec_v =
|
||||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = _y4m->pic_w * _y4m->pic_h;
|
||||
/*Chroma filter required: read into the aux buf first.
|
||||
We need to make two filter passes, so we need some extra space in the
|
||||
aux buffer.*/
|
||||
_y4m->aux_buf_sz = 3 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
_y4m->aux_buf_read_sz = 2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
_y4m->aux_buf_read_sz =
|
||||
2 * ((_y4m->pic_w + 1) / 2) * ((_y4m->pic_h + 1) / 2);
|
||||
_y4m->convert = y4m_convert_42xpaldv_42xjpeg;
|
||||
} else if (strcmp(_y4m->chroma_type, "422jpeg") == 0) {
|
||||
_y4m->src_c_dec_h = _y4m->dst_c_dec_h = 2;
|
||||
|
@ -810,7 +879,8 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
_y4m->dst_c_dec_v = 2;
|
||||
_y4m->dst_buf_read_sz = _y4m->pic_w * _y4m->pic_h;
|
||||
/*Chroma filter required: read into the aux buf first.*/
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz = 2 * ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz =
|
||||
2 * ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->convert = y4m_convert_422jpeg_420jpeg;
|
||||
} else if (strcmp(_y4m->chroma_type, "422") == 0) {
|
||||
_y4m->src_c_dec_h = 2;
|
||||
|
@ -823,16 +893,16 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
We need to make two filter passes, so we need some extra space in the
|
||||
aux buffer.*/
|
||||
_y4m->aux_buf_read_sz = 2 * ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz +
|
||||
((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz =
|
||||
_y4m->aux_buf_read_sz + ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->convert = y4m_convert_422_420jpeg;
|
||||
} else {
|
||||
_y4m->vpx_fmt = VPX_IMG_FMT_I422;
|
||||
_y4m->bps = 16;
|
||||
_y4m->dst_c_dec_h = _y4m->src_c_dec_h;
|
||||
_y4m->dst_c_dec_v = _y4m->src_c_dec_v;
|
||||
_y4m->dst_buf_read_sz = _y4m->pic_w * _y4m->pic_h
|
||||
+ 2 * ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->dst_buf_read_sz =
|
||||
_y4m->pic_w * _y4m->pic_h + 2 * ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
/*Natively supported: no conversion required.*/
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz = 0;
|
||||
_y4m->convert = y4m_convert_null;
|
||||
|
@ -879,7 +949,8 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
We need to make two filter passes, so we need some extra space in the
|
||||
aux buffer.*/
|
||||
_y4m->aux_buf_read_sz = 2 * ((_y4m->pic_w + 3) / 4) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz + ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz =
|
||||
_y4m->aux_buf_read_sz + ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->convert = y4m_convert_411_420jpeg;
|
||||
} else if (strcmp(_y4m->chroma_type, "444") == 0) {
|
||||
_y4m->src_c_dec_h = 1;
|
||||
|
@ -892,8 +963,8 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
We need to make two filter passes, so we need some extra space in the
|
||||
aux buffer.*/
|
||||
_y4m->aux_buf_read_sz = 2 * _y4m->pic_w * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz = _y4m->aux_buf_read_sz +
|
||||
((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->aux_buf_sz =
|
||||
_y4m->aux_buf_read_sz + ((_y4m->pic_w + 1) / 2) * _y4m->pic_h;
|
||||
_y4m->convert = y4m_convert_444_420jpeg;
|
||||
} else {
|
||||
_y4m->vpx_fmt = VPX_IMG_FMT_I444;
|
||||
|
@ -972,9 +1043,10 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
|||
}
|
||||
/*The size of the final frame buffers is always computed from the
|
||||
destination chroma decimation type.*/
|
||||
_y4m->dst_buf_sz = _y4m->pic_w * _y4m->pic_h
|
||||
+ 2 * ((_y4m->pic_w + _y4m->dst_c_dec_h - 1) / _y4m->dst_c_dec_h) *
|
||||
((_y4m->pic_h + _y4m->dst_c_dec_v - 1) / _y4m->dst_c_dec_v);
|
||||
_y4m->dst_buf_sz =
|
||||
_y4m->pic_w * _y4m->pic_h +
|
||||
2 * ((_y4m->pic_w + _y4m->dst_c_dec_h - 1) / _y4m->dst_c_dec_h) *
|
||||
((_y4m->pic_h + _y4m->dst_c_dec_v - 1) / _y4m->dst_c_dec_v);
|
||||
if (_y4m->bit_depth == 8)
|
||||
_y4m->dst_buf = (unsigned char *)malloc(_y4m->dst_buf_sz);
|
||||
else
|
||||
|
@ -992,11 +1064,11 @@ void y4m_input_close(y4m_input *_y4m) {
|
|||
|
||||
int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *_img) {
|
||||
char frame[6];
|
||||
int pic_sz;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int bytes_per_sample = _y4m->bit_depth > 8 ? 2 : 1;
|
||||
int pic_sz;
|
||||
int c_w;
|
||||
int c_h;
|
||||
int c_sz;
|
||||
int bytes_per_sample = _y4m->bit_depth > 8 ? 2 : 1;
|
||||
/*Read and skip the frame header.*/
|
||||
if (!file_read(frame, 6, _fin)) return 0;
|
||||
if (memcmp(frame, "FRAME", 5)) {
|
||||
|
@ -1005,8 +1077,9 @@ int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *_img) {
|
|||
}
|
||||
if (frame[5] != '\n') {
|
||||
char c;
|
||||
int j;
|
||||
for (j = 0; j < 79 && file_read(&c, 1, _fin) && c != '\n'; j++) {}
|
||||
int j;
|
||||
for (j = 0; j < 79 && file_read(&c, 1, _fin) && c != '\n'; j++) {
|
||||
}
|
||||
if (j == 79) {
|
||||
fprintf(stderr, "Error parsing Y4M frame header\n");
|
||||
return -1;
|
||||
|
|
58
y4minput.h
58
y4minput.h
|
@ -14,52 +14,46 @@
|
|||
#ifndef Y4MINPUT_H_
|
||||
#define Y4MINPUT_H_
|
||||
|
||||
# include <stdio.h>
|
||||
# include "vpx/vpx_image.h"
|
||||
#include <stdio.h>
|
||||
#include "vpx/vpx_image.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
typedef struct y4m_input y4m_input;
|
||||
|
||||
|
||||
|
||||
/*The function used to perform chroma conversion.*/
|
||||
typedef void (*y4m_convert_func)(y4m_input *_y4m,
|
||||
unsigned char *_dst, unsigned char *_src);
|
||||
|
||||
|
||||
typedef void (*y4m_convert_func)(y4m_input *_y4m, unsigned char *_dst,
|
||||
unsigned char *_src);
|
||||
|
||||
struct y4m_input {
|
||||
int pic_w;
|
||||
int pic_h;
|
||||
int fps_n;
|
||||
int fps_d;
|
||||
int par_n;
|
||||
int par_d;
|
||||
char interlace;
|
||||
int src_c_dec_h;
|
||||
int src_c_dec_v;
|
||||
int dst_c_dec_h;
|
||||
int dst_c_dec_v;
|
||||
char chroma_type[16];
|
||||
int pic_w;
|
||||
int pic_h;
|
||||
int fps_n;
|
||||
int fps_d;
|
||||
int par_n;
|
||||
int par_d;
|
||||
char interlace;
|
||||
int src_c_dec_h;
|
||||
int src_c_dec_v;
|
||||
int dst_c_dec_h;
|
||||
int dst_c_dec_v;
|
||||
char chroma_type[16];
|
||||
/*The size of each converted frame buffer.*/
|
||||
size_t dst_buf_sz;
|
||||
size_t dst_buf_sz;
|
||||
/*The amount to read directly into the converted frame buffer.*/
|
||||
size_t dst_buf_read_sz;
|
||||
size_t dst_buf_read_sz;
|
||||
/*The size of the auxilliary buffer.*/
|
||||
size_t aux_buf_sz;
|
||||
size_t aux_buf_sz;
|
||||
/*The amount to read into the auxilliary buffer.*/
|
||||
size_t aux_buf_read_sz;
|
||||
y4m_convert_func convert;
|
||||
unsigned char *dst_buf;
|
||||
unsigned char *aux_buf;
|
||||
enum vpx_img_fmt vpx_fmt;
|
||||
int bps;
|
||||
unsigned int bit_depth;
|
||||
size_t aux_buf_read_sz;
|
||||
y4m_convert_func convert;
|
||||
unsigned char *dst_buf;
|
||||
unsigned char *aux_buf;
|
||||
enum vpx_img_fmt vpx_fmt;
|
||||
int bps;
|
||||
unsigned int bit_depth;
|
||||
};
|
||||
|
||||
int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
|
||||
|
|
Загрузка…
Ссылка в новой задаче