CVSROOT: /sources/gnash Module name: gnash Changes by: Tomas Groth <tgc> 07/05/25 09:38:00
Modified files: . : ChangeLog server/asobj : NetStreamFfmpeg.h Log message: * server/asobj/NetStreamFfmpeg.h: Fix resampling for some FLVs, fixes bug #19959. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3351&r2=1.3352 http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.29&r2=1.30 Patches: Index: ChangeLog =================================================================== RCS file: /sources/gnash/gnash/ChangeLog,v retrieving revision 1.3351 retrieving revision 1.3352 diff -u -b -r1.3351 -r1.3352 --- ChangeLog 25 May 2007 07:36:43 -0000 1.3351 +++ ChangeLog 25 May 2007 09:37:59 -0000 1.3352 @@ -1,3 +1,8 @@ +2007-05-25 Tomas Groth Christensen <[EMAIL PROTECTED]> + + * server/asobj/NetStreamFfmpeg.h: Fix resampling for some FLVs, + fixes bug #19959. + 2007-05-25 Sandro Santilli <[EMAIL PROTECTED]> * libbase/log.cpp (timestamp): include PID in timestamp, Index: server/asobj/NetStreamFfmpeg.h =================================================================== RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -b -r1.29 -r1.30 --- server/asobj/NetStreamFfmpeg.h 23 May 2007 07:42:16 -0000 1.29 +++ server/asobj/NetStreamFfmpeg.h 25 May 2007 09:37:59 -0000 1.30 @@ -14,7 +14,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -/* $Id: NetStreamFfmpeg.h,v 1.29 2007/05/23 07:42:16 tgc Exp $ */ +/* $Id: NetStreamFfmpeg.h,v 1.30 2007/05/25 09:37:59 tgc Exp $ */ #ifndef __NETSTREAMFFMPEG_H__ #define __NETSTREAMFFMPEG_H__ @@ -155,7 +155,7 @@ bool init(AVCodecContext* ctx) { - if (ctx->sample_rate != 44100 && ctx->channels != 2) { + if (ctx->sample_rate != 44100 || ctx->channels != 2) { if (!_context) { _context = audio_resample_init(2, ctx->channels, 44100, ctx->sample_rate); @@ -170,9 +170,6 @@ return audio_resample (_context, output, input, samples); } - // The timestamp of the last decoded video frame - volatile double m_last_video_timestamp; - private: ReSampleContext* _context; }; @@ -188,11 +185,14 @@ int64_t time(); void advance(); - // Used for ffmpeg data read and seek callbacks + // Used for ffmpeg data read and seek callbacks with non-FLV static int readPacket(void* opaque, uint8_t* buf, int buf_size); static offset_t seekMedia(void *opaque, offset_t offset, int whence); + // The decoding thread. Sets up the decoder, and decodes. static void av_streamer(NetStreamFfmpeg* ns); + + // Callback used by the soundhandler to get audio data static bool audio_streamer(void *udata, uint8_t *stream, int len); private: _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit