Commit d24f4e49 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Removing CONFIG_MD5.

We don't need compile time md5 configuration because --md5 is a runtime
option.

Change-Id: Ic0a2427ae5de5a18f31e5ee60c3732481b377ca1
parent 46d5cc43
...@@ -32,7 +32,6 @@ Advanced options: ...@@ -32,7 +32,6 @@ Advanced options:
supported by hardware [auto] supported by hardware [auto]
${toggle_codec_srcs} in/exclude codec library source code ${toggle_codec_srcs} in/exclude codec library source code
${toggle_debug_libs} in/exclude debug version of libraries ${toggle_debug_libs} in/exclude debug version of libraries
${toggle_md5} support for output of checksum data
${toggle_static_msvcrt} use static MSVCRT (VS builds only) ${toggle_static_msvcrt} use static MSVCRT (VS builds only)
${toggle_vp8} VP8 codec support ${toggle_vp8} VP8 codec support
${toggle_vp9} VP9 codec support ${toggle_vp9} VP9 codec support
...@@ -184,7 +183,6 @@ enable_feature install_libs ...@@ -184,7 +183,6 @@ enable_feature install_libs
enable_feature static enable_feature static
enable_feature optimizations enable_feature optimizations
enable_feature fast_unaligned #allow unaligned accesses, if supported by hw enable_feature fast_unaligned #allow unaligned accesses, if supported by hw
enable_feature md5
enable_feature spatial_resampling enable_feature spatial_resampling
enable_feature multithread enable_feature multithread
enable_feature os_support enable_feature os_support
...@@ -279,7 +277,6 @@ CONFIG_LIST=" ...@@ -279,7 +277,6 @@ CONFIG_LIST="
mem_manager mem_manager
mem_tracker mem_tracker
mem_checks mem_checks
md5
dequant_tokens dequant_tokens
dc_recon dc_recon
...@@ -336,7 +333,6 @@ CMDLINE_SELECT=" ...@@ -336,7 +333,6 @@ CMDLINE_SELECT="
fast_unaligned fast_unaligned
codec_srcs codec_srcs
debug_libs debug_libs
md5
dequant_tokens dequant_tokens
dc_recon dc_recon
......
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include "vpx/vp8dx.h" #include "vpx/vp8dx.h"
#endif #endif
#if CONFIG_MD5
#include "./md5_utils.h" #include "./md5_utils.h"
#endif
#include "./tools_common.h" #include "./tools_common.h"
#include "./webmdec.h" #include "./webmdec.h"
...@@ -95,17 +93,14 @@ static const arg_def_t fb_lru_arg = ...@@ -95,17 +93,14 @@ static const arg_def_t fb_lru_arg =
ARG_DEF(NULL, "frame-buffers-lru", 1, "Turn on/off frame buffer lru"); ARG_DEF(NULL, "frame-buffers-lru", 1, "Turn on/off frame buffer lru");
#if CONFIG_MD5
static const arg_def_t md5arg = ARG_DEF(NULL, "md5", 0, static const arg_def_t md5arg = ARG_DEF(NULL, "md5", 0,
"Compute the MD5 sum of the decoded frame"); "Compute the MD5 sum of the decoded frame");
#endif
static const arg_def_t *all_args[] = { static const arg_def_t *all_args[] = {
&codecarg, &use_yv12, &use_i420, &flipuvarg, &noblitarg, &codecarg, &use_yv12, &use_i420, &flipuvarg, &noblitarg,
&progressarg, &limitarg, &skiparg, &postprocarg, &summaryarg, &outputfile, &progressarg, &limitarg, &skiparg, &postprocarg, &summaryarg, &outputfile,
&threadsarg, &verbosearg, &scalearg, &fb_arg, &fb_lru_arg, &threadsarg, &verbosearg, &scalearg, &fb_arg, &fb_lru_arg,
#if CONFIG_MD5
&md5arg, &md5arg,
#endif
&error_concealment, &error_concealment,
NULL NULL
}; };
...@@ -236,11 +231,9 @@ void *out_open(const char *out_fn, int do_md5) { ...@@ -236,11 +231,9 @@ void *out_open(const char *out_fn, int do_md5) {
void *out = NULL; void *out = NULL;
if (do_md5) { if (do_md5) {
#if CONFIG_MD5
MD5Context *md5_ctx = out = malloc(sizeof(MD5Context)); MD5Context *md5_ctx = out = malloc(sizeof(MD5Context));
(void)out_fn; (void)out_fn;
MD5Init(md5_ctx); MD5Init(md5_ctx);
#endif
} else { } else {
FILE *outfile = out = strcmp("-", out_fn) ? fopen(out_fn, "wb") FILE *outfile = out = strcmp("-", out_fn) ? fopen(out_fn, "wb")
: set_binary_mode(stdout); : set_binary_mode(stdout);
...@@ -255,9 +248,7 @@ void *out_open(const char *out_fn, int do_md5) { ...@@ -255,9 +248,7 @@ void *out_open(const char *out_fn, int do_md5) {
void out_put(void *out, const uint8_t *buf, unsigned int len, int do_md5) { void out_put(void *out, const uint8_t *buf, unsigned int len, int do_md5) {
if (do_md5) { if (do_md5) {
#if CONFIG_MD5
MD5Update(out, buf, len); MD5Update(out, buf, len);
#endif
} else { } else {
(void) fwrite(buf, 1, len, out); (void) fwrite(buf, 1, len, out);
} }
...@@ -265,7 +256,6 @@ void out_put(void *out, const uint8_t *buf, unsigned int len, int do_md5) { ...@@ -265,7 +256,6 @@ void out_put(void *out, const uint8_t *buf, unsigned int len, int do_md5) {
void out_close(void *out, const char *out_fn, int do_md5) { void out_close(void *out, const char *out_fn, int do_md5) {
if (do_md5) { if (do_md5) {
#if CONFIG_MD5
uint8_t md5[16]; uint8_t md5[16];
int i; int i;
...@@ -276,7 +266,6 @@ void out_close(void *out, const char *out_fn, int do_md5) { ...@@ -276,7 +266,6 @@ void out_close(void *out, const char *out_fn, int do_md5) {
printf("%02x", md5[i]); printf("%02x", md5[i]);
printf(" %s\n", out_fn); printf(" %s\n", out_fn);
#endif
} else { } else {
fclose(out); fclose(out);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment