Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h

Issue 8341002: VP8: fix up handling of segmentation_maps in reference frames. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party
Patch Set: merge Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h
diff --git a/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h b/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h
index 468e28e8d5d2d289c718a931dfcbfd3d02b1c8d6..36c21df2175add978136740187364ba1e3336096 100644
--- a/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h
+++ b/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h
@@ -130,7 +130,6 @@ typedef struct {
uint8_t *intra4x4_pred_mode_top;
uint8_t intra4x4_pred_mode_left[4];
- uint8_t *segmentation_map;
/**
* Macroblocks can have one of 4 different quants in a frame when
@@ -237,6 +236,16 @@ typedef struct {
H264PredContext hpc;
vp8_mc_func put_pixels_tab[3][3][3];
AVFrame frames[5];
+
+ /**
+ * A list of segmentation_map buffers that are to be free()'ed in
+ * the next decoding iteration. We can't free() them right away
+ * because the map may still be used by subsequent decoding threads.
+ * Unused if frame threading is off.
+ */
+ uint8_t *segmentation_maps[5];
+ int num_maps_to_be_freed;
+ int maps_are_invalid;
} VP8Context;
#endif /* AVCODEC_VP8_H */
« no previous file with comments | « ffmpeg/patches/to_upstream/42_vp8_fix_segmentation_maps.patch ('k') | ffmpeg/source/patched-ffmpeg/libavcodec/vp8.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698