[Gnash-commit] [patch #8993] Patches to fix problems when `--disable-media` configure option was used

[Nutchanon Wetchasit]

Follow-up Comment #7, patch #8993 (project gnash):

>From the code causing link error, they are
<http://git.savannah.gnu.org/cgit/gnash.git/tree/libcore/swf/SoundStreamHeadTag.cpp?id=484ca4cd2fecb73c3308fd451004f6cc2e976fbe#n148>
both
<http://git.savannah.gnu.org/cgit/gnash.git/tree/libcore/swf/tag_loaders.cpp?id=484ca4cd2fecb73c3308fd451004f6cc2e976fbe#n190>
SWF parser's *logging code*; when `log_parse()` tries to convert
`media::audioCodecType` to string, it invokes operator `ostream <<
media::audioCodecType`, which is only implemented in `libgnashmedia.so`.

If I just strip them off using following patch and re-build (with patch 1 but
exclude MediaParser inlining), the build will complete without error.

diff --git a/libcore/swf/SoundStreamHeadTag.cpp
b/libcore/swf/SoundStreamHeadTag.cpp
index 3b20909..65516a1 100644
--- a/libcore/swf/SoundStreamHeadTag.cpp
+++ b/libcore/swf/SoundStreamHeadTag.cpp
@@ -144,12 +144,6 @@ SoundStreamHeadTag::loader(SWFStream& in, TagType tag,
movie_definition& m,
         log_unimpl("SOUNDSTREAMHEAD contains %d unparsed bytes",
endTag-curPos);
     }
 
-    IF_VERBOSE_PARSE(
-        log_parse(_("sound stream head: format=%s, rate=%d, 16=%d, "
-            "stereo=%d, ct=%d, latency=%d"), format, streamSoundRate,
-            +streamSound16bit, +streamSoundStereo, +sampleCount, +latency);
-    );
-
     // Store all the data in a SoundInfo object
     const media::SoundInfo sinfo(format, streamSoundStereo,
                 streamSoundRate, sampleCount, streamSound16bit, latency);
diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index c0da0ce..ed14a1e 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -186,12 +186,6 @@ define_sound_loader(SWFStream& in, TagType tag,
movie_definition& m,
         delaySeek = in.read_s16();
     }
 
-    IF_VERBOSE_PARSE(
-        log_parse(_("define sound: ch=%d, format=%s, rate=%d, 16=%d, "
-            "stereo=%d, ct=%d, delay=%d"), id, format, sample_rate,
-            sample_16bit, stereo, sample_count, delaySeek);
-    );
-
     // If we have a sound_handler, ask it to init this sound.
 
     if (handler) {


Note: The video counterpart of this enum (media::videoCodecType
<http://git.savannah.gnu.org/cgit/gnash.git/tree/libmedia/MediaParser.h?id=484ca4cd2fecb73c3308fd451004f6cc2e976fbe#n75>)
is also used in libcore's SWF parser at
`libcore/swf/DefineVideoStreamTag.cpp:89`
<http://git.savannah.gnu.org/cgit/gnash.git/tree/libcore/swf/DefineVideoStreamTag.cpp?id=484ca4cd2fecb73c3308fd451004f6cc2e976fbe#n89>
but the code didn't try to print out the codec name, so it didn't cause any
more link error.

Gnash: 0.8.11dev (patched against git 484ca4c 29-Mar-2016)
System: Debian GNU/Linux 7.0 Wheezy i386


    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/patch/?8993>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/