From e8694d4dc311a105d3808021b66fb93ab27751ed Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 8 Jan 2015 20:02:40 -0800 Subject: [PATCH] mux: remove experimental FRGM parsing fragment references remain: to be removed in a future commit Change-Id: I02974c8a709cfe16dce72568639c8b912859de8e --- src/mux/muxedit.c | 4 +--- src/mux/muxread.c | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mux/muxedit.c b/src/mux/muxedit.c index 18f7052d..b27663f8 100644 --- a/src/mux/muxedit.c +++ b/src/mux/muxedit.c @@ -278,11 +278,9 @@ WebPMuxError WebPMuxPushFrame(WebPMux* mux, const WebPMuxFrameInfo* frame, if (!(is_frame || (frame->id == WEBP_CHUNK_FRGM))) { return WEBP_MUX_INVALID_ARGUMENT; } -#ifndef WEBP_EXPERIMENTAL_FEATURES - if (frame->id == WEBP_CHUNK_FRGM) { // disabled for now. + if (frame->id == WEBP_CHUNK_FRGM) { // Dead experiment. return WEBP_MUX_INVALID_ARGUMENT; } -#endif if (bitstream->bytes == NULL || bitstream->size > MAX_CHUNK_PAYLOAD) { return WEBP_MUX_INVALID_ARGUMENT; diff --git a/src/mux/muxread.c b/src/mux/muxread.c index bba09a5d..8957a1e4 100644 --- a/src/mux/muxread.c +++ b/src/mux/muxread.c @@ -251,9 +251,6 @@ WebPMux* WebPMuxCreateInternal(const WebPData* bitstream, int copy_data, MuxImageInit(wpi); // Reset for reading next image. break; case WEBP_CHUNK_ANMF: -#ifdef WEBP_EXPERIMENTAL_FEATURES - case WEBP_CHUNK_FRGM: -#endif if (wpi->is_partial_) goto Err; // Previous wpi is still incomplete. if (!MuxImageParse(&chunk, copy_data, wpi)) goto Err; ChunkRelease(&chunk); @@ -444,9 +441,7 @@ static WebPMuxError MuxGetFrameFragmentInternal(const WebPMuxImage* const wpi, const int is_frame = (wpi->header_->tag_ == kChunks[IDX_ANMF].tag); const CHUNK_INDEX idx = is_frame ? IDX_ANMF : IDX_FRGM; const WebPData* frame_frgm_data; -#ifndef WEBP_EXPERIMENTAL_FEATURES if (!is_frame) return WEBP_MUX_INVALID_ARGUMENT; -#endif assert(wpi->header_ != NULL); // Already checked by WebPMuxGetFrame(). // Get frame/fragment chunk. frame_frgm_data = &wpi->header_->data_;