shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge remote branch 'origin/master' into experimental

--- a/examples/vp8_set_maps.txt

+++ b/examples/vp8_set_maps.txt

@@ -78,8 +78,8 @@

 } else if(frame_cnt + 1 == 44) {

     vpx_active_map_t  active;

-    active.rows = 240/16;

-    active.cols = 320/16;

+    active.rows = cfg.g_h/16;

+    active.cols = cfg.g_w/16;

     /* pass in null map to disable active_map*/

     active.active_map = NULL;

--- a/vp8/decoder/decoderthreading.h

+++ b/vp8/decoder/decoderthreading.h

@@ -19,7 +19,7 @@

 extern void vp8mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd);

 extern void vp8_decoder_remove_threads(VP8D_COMP *pbi);

 extern void vp8_decoder_create_threads(VP8D_COMP *pbi);

-extern int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows);

+extern void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows);

 extern void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows);

 #endif

--- a/vp8/decoder/threading.c

+++ b/vp8/decoder/threading.c

@@ -596,7 +596,7 @@

 }

-int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)

+void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)

 {

 #if CONFIG_MULTITHREAD

     VP8_COMMON *const pc = & pbi->common;

@@ -647,7 +647,6 @@

         for (i=0; i< pc->mb_rows; i++)

             CHECK_MEM_ERROR(pbi->mt_vleft_col[i], vpx_calloc(sizeof(unsigned char) * 8, 1));

     }

-    return 0;

 #else

     (void) pbi;

     (void) width;

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -105,6 +105,7 @@

 }

+#undef ERROR

 #define ERROR(str) do {\

         ctx->base.err_detail = str;\

         return VPX_CODEC_INVALID_PARAM;\

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -442,6 +442,8 @@

     int is_raw = 0;

     vpx_codec_stream_info_t si;

+    si.sz = sizeof(si);

+

     if (fread(buf, 1, 32, infile) == 32)

     {

         int i;