Revert "SkJpegCodec: Add SkJpegSourceMgr"

This reverts commit 7d0c572. Reason for revert: Chrome roller failing Original change's description: > SkJpegCodec: Add SkJpegSourceMgr > > The current skjpeg_source_mgr (in SkJpegUtility.cpp/h) is effectively > two implementations (buffered vs in-memory) controlled via if > statements. > > Turn these into two implementations of a pure virtual interface > SkJpegSourceMgr. The reason for this it that there will be a third > interface added for buffered non-seekable sources (which will > run an SkJpegSegmentScanner on the data as it is read). > > Leave the pre-existing skjpeg_source_mgr in place because it may > be used in other places. It will be removed separately. > > Bug: skia:14031 > Change-Id: Iae87c0da307dfec50c95168c50486c807d335526 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/633461 > Reviewed-by: Brian Osman <[email protected]> > Commit-Queue: Christopher Cameron <[email protected]> Bug: skia:14031 Change-Id: I55e020bdcae3ba557f2e90fab9d150ec47f22921 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/635576 Auto-Submit: Brian Osman <[email protected]> Commit-Queue: Rubber Stamper <[email protected]> Bot-Commit: Rubber Stamper <[email protected]>
armansito · Jan 30, 2023 · 9b3a9f2 · 9b3a9f2
1 parent 86b7e4b
commit 9b3a9f2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 222 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -1208,7 +1208,6 @@ optional("jpeg_decode") {
   sources = [
     "src/codec/SkJpegCodec.cpp",
     "src/codec/SkJpegDecoderMgr.cpp",
-    "src/codec/SkJpegSourceMgr.cpp",
     "src/codec/SkJpegUtility.cpp",
   ]
   if (skia_use_jpeg_gainmaps) {

diff --git a/src/codec/BUILD.bazel b/src/codec/BUILD.bazel
@@ -86,8 +86,6 @@ DECODE_JPEG_FILES = [
     "SkJpegCodec.h",
     "SkJpegDecoderMgr.cpp",
     "SkJpegDecoderMgr.h",
-    "SkJpegSourceMgr.cpp",
-    "SkJpegSourceMgr.h",
     "SkJpegUtility.cpp",
     "SkJpegUtility.h",
     "SkParseEncodedOrigin.cpp",

diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp
@@ -7,16 +7,12 @@
 #include "src/codec/SkJpegDecoderMgr.h"
 
 #include "src/codec/SkCodecPriv.h"
-#include "src/codec/SkJpegSourceMgr.h"
 #include "src/codec/SkJpegUtility.h"
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     #include "include/android/SkAndroidFrameworkUtils.h"
 #endif
 
-#include <cstddef>
-#include <utility>
-
 class SkStream;
 
 /*
@@ -46,9 +42,6 @@ static void progress_monitor(j_common_ptr info) {
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// JpegDecoderMgr
-
 bool JpegDecoderMgr::returnFalse(const char caller[]) {
     print_message((j_common_ptr) &fDInfo, caller);
     return false;
@@ -84,12 +77,10 @@ bool JpegDecoderMgr::getEncodedColor(SkEncodedInfo::Color* outColor) {
     }
 }
 
-SkJpegSourceMgr* JpegDecoderMgr::getSourceMgr() {
-    return fSrcMgr.fSourceMgr.get();
-}
-
 JpegDecoderMgr::JpegDecoderMgr(SkStream* stream)
-        : fSrcMgr(SkJpegSourceMgr::Make(stream)), fInit(false) {
+    : fSrcMgr(stream)
+    , fInit(false)
+{
     // Error manager must be set before any calls to libjeg in order to handle failures
     fDInfo.err = jpeg_std_error(&fErrorMgr);
     fErrorMgr.error_exit = skjpeg_err_exit;
@@ -109,48 +100,3 @@ JpegDecoderMgr::~JpegDecoderMgr() {
         jpeg_destroy_decompress(&fDInfo);
     }
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// JpegDecoderMgr::SourceMgr
-
-// static
-void JpegDecoderMgr::SourceMgr::InitSource(j_decompress_ptr dinfo) {
-    JpegDecoderMgr::SourceMgr* src = (JpegDecoderMgr::SourceMgr*)dinfo->src;
-    src->fSourceMgr->initSource(src->next_input_byte, src->bytes_in_buffer);
-}
-
-// static
-void JpegDecoderMgr::SourceMgr::SkipInputData(j_decompress_ptr dinfo, long num_bytes_long) {
-    JpegDecoderMgr::SourceMgr* src = (JpegDecoderMgr::SourceMgr*)dinfo->src;
-    size_t num_bytes = static_cast<size_t>(num_bytes_long);
-    if (!src->fSourceMgr->skipInputBytes(num_bytes, src->next_input_byte, src->bytes_in_buffer)) {
-        SkCodecPrintf("Failure to skip.\n");
-        src->next_input_byte = nullptr;
-        src->bytes_in_buffer = 0;
-        dinfo->err->error_exit((j_common_ptr)dinfo);
-    }
-}
-
-// static
-boolean JpegDecoderMgr::SourceMgr::FillInputBuffer(j_decompress_ptr dinfo) {
-    JpegDecoderMgr::SourceMgr* src = (JpegDecoderMgr::SourceMgr*)dinfo->src;
-    if (!src->fSourceMgr->fillInputBuffer(src->next_input_byte, src->bytes_in_buffer)) {
-        SkCodecPrintf("Failure to fill input buffer.\n");
-        src->next_input_byte = nullptr;
-        src->bytes_in_buffer = 0;
-        return false;
-    }
-    return true;
-}
-
-// static
-void JpegDecoderMgr::SourceMgr::TermSource(j_decompress_ptr dinfo) {}
-
-JpegDecoderMgr::SourceMgr::SourceMgr(std::unique_ptr<SkJpegSourceMgr> sourceMgr)
-        : fSourceMgr(std::move(sourceMgr)) {
-    init_source = JpegDecoderMgr::SourceMgr::InitSource;
-    fill_input_buffer = JpegDecoderMgr::SourceMgr::FillInputBuffer;
-    skip_input_data = JpegDecoderMgr::SourceMgr::SkipInputData;
-    resync_to_restart = jpeg_resync_to_restart;
-    term_source = JpegDecoderMgr::SourceMgr::TermSource;
-}
diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h
@@ -12,15 +12,12 @@
 #include "include/private/SkEncodedInfo.h"
 #include "include/private/base/SkNoncopyable.h"
 #include "src/codec/SkJpegPriv.h"
-#include "src/codec/SkJpegSourceMgr.h"
+#include "src/codec/SkJpegUtility.h"
 
 extern "C" {
     #include "jpeglib.h"
-    #include "jmorecfg.h"
 }
 
-#include <memory>
-
 class SkStream;
 
 class JpegDecoderMgr : SkNoncopyable {
@@ -69,23 +66,10 @@ class JpegDecoderMgr : SkNoncopyable {
      */
     jpeg_decompress_struct* dinfo() { return &fDInfo; }
 
-    // Get the source manager.
-    SkJpegSourceMgr* getSourceMgr();
-
 private:
-    // Wrapper that calls into the full SkJpegSourceMgr interface.
-    struct SourceMgr : jpeg_source_mgr {
-        static void InitSource(j_decompress_ptr dinfo);
-        static void SkipInputData(j_decompress_ptr dinfo, long num_bytes_long);
-        static boolean FillInputBuffer(j_decompress_ptr dinfo);
-        static void TermSource(j_decompress_ptr dinfo);
-
-        SourceMgr(std::unique_ptr<SkJpegSourceMgr> mgr);
-        std::unique_ptr<SkJpegSourceMgr> fSourceMgr;
-    };
 
     jpeg_decompress_struct fDInfo;
-    SourceMgr              fSrcMgr;
+    skjpeg_source_mgr      fSrcMgr;
     skjpeg_error_mgr       fErrorMgr;
     jpeg_progress_mgr      fProgressMgr;
     bool                   fInit;

diff --git a/src/codec/SkJpegSourceMgr.cpp b/src/codec/SkJpegSourceMgr.cpp
diff --git a/src/codec/SkJpegSourceMgr.h b/src/codec/SkJpegSourceMgr.h