summaryrefslogtreecommitdiff
path: root/libavformat/rmdec.c
Commit message (Collapse)AuthorAge
...
* Prevent (negative) overflow of rm->remaining_len. This evaluation really onlyRonald S. Bultje2009-03-09
| | | | | | | | | | | has two possible outcomes: either len and rm->remaining_len are the same, in which case we care about the outcome and it is zero, or rm->remaining_len is currently not in use and we don't care about the outcome. In that case, len is positive and rm->remaining_len is zero, which leads to a negative result. This is confusing and could eventually lead to a sign-flip if we skip a lot of packets (unlikely, but still). Therefore, just always set it to zero. Originally committed as revision 17919 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert to r17908.Ronald S. Bultje2009-03-09
| | | | Originally committed as revision 17918 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prevent (negative) overflow of rm->remaining_len. This evaluation really onlyRonald S. Bultje2009-03-09
| | | | | | | | | | | has two possible outcomes: either len and rm->remaining_len are the same, in which case we care about the outcome and it is zero, or rm->remaining_len is currently not in use and we don't care about the outcome. In that case, len is positive and rm->remaining_len is zero, which leads to a negative result. This is confusing and could eventually lead to a sign-flip if we skip a lot of packets (unlikely, but still). Therefore, just always set it to zero. Originally committed as revision 17910 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace separate packet parsing for "old_format" .ra files by a call toRonald S. Bultje2009-03-09
| | | | | | | | ff_rm_parse_packet(). See "[PATCH] Make RM demuxer behave better with -an option" thread, which sort-of turned into an aggregate of unrelated rmdec.c cleanups. Originally committed as revision 17909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move frame discarding out of the ff_rm_parse_packet() loop, and respectRonald S. Bultje2009-03-09
| | | | | | | | | rm->audio_pkt_cnt in case multiple packets should be read before the next syncpoint in the file, so that ffplay -an on a file containing AAC audio works. See "[PATCH] Make RM demuxer behave better with -an option" thread on mailinglist. Originally committed as revision 17908 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove now useless get_str16() from rmdec.cAurelien Jacobs2009-02-17
| | | | Originally committed as revision 17397 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use new metadata API in rm (de)muxerAurelien Jacobs2009-02-17
| | | | Originally committed as revision 17396 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a context to av_log() calls.Benoit Fouet2009-02-16
| | | | Originally committed as revision 17377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use more descriptive format long_names.Diego Biurrun2009-02-12
| | | | Originally committed as revision 17184 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reformat rdt_demuxer AVCodec struct sanely.Michael Niedermayer2009-02-03
| | | | Originally committed as revision 16969 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix build: Add intreadwrite.h and bswap.h #includes where necessary.Diego Biurrun2009-01-11
| | | | Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a compiler warning:Dominique Leuenberger2009-01-07
| | | | | | | | libavformat/rmdec.c:550: warning: assignment makes pointer from integer Patch by Dominique Leuenberger (dominique-ffmpeg-devel A leuenberger D net) Originally committed as revision 16489 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l set AVPacket.size to the true size of the returned data instead ofMichael Niedermayer2008-12-31
| | | | | | | the (larger) allocated size. (prevents segfaults due to later failures from 900MB-sized packets, yes fuzzed file not a valid one) Originally committed as revision 16404 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix indention which was off by 1 space.Michael Niedermayer2008-12-31
| | | | Originally committed as revision 16403 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace buffer by AVPacket and avoid a memcpy() for video when the numberMichael Niedermayer2008-12-31
| | | | | | | of allocated slices matches the actual. Audio still does a copy (marked with FIXME in the code so this is not missed). Originally committed as revision 16402 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge videobuf and audiobuf.Michael Niedermayer2008-12-31
| | | | Originally committed as revision 16401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify the top of rm_assemble_video_frame().Michael Niedermayer2008-12-30
| | | | Originally committed as revision 16400 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a few error checks to rm_assemble_video_frame()Michael Niedermayer2008-12-30
| | | | Originally committed as revision 16399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* All non zero returns of rm_assemble_video_frame() are errors, check thingsMichael Niedermayer2008-12-30
| | | | | | accordingly. Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
* av_free() -> av_freep(), patch by Reimar Doffinger, see discussion inReimar Döffinger2008-12-28
| | | | | | "rmdec.c: double free" thread on mailinglist. Originally committed as revision 16379 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix double free which happens for playback of .rm files after r16365. SeeRonald S. Bultje2008-12-28
| | | | | | | "rmdec.c: double free" discussion on mailinglist, patch with suggestions from Reimar Doffinger. Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion inRonald S. Bultje2008-12-28
| | | | | | "[PATCH] oops I broke rdt.c" mailinglist thread. Originally committed as revision 16368 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add RMStream object as function argument to public functions so that non-.rmRonald S. Bultje2008-12-28
| | | | | | | | AVStreams can be used to call these public rmdec.c functions as well, as is the case for RDT/RTSP streams. See mailinglist discussion in "[PATCH] rdt.c: don't reuse the same AVStream in both RTSP and RM demuxer" thread. Originally committed as revision 16366 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement RMStream stream-specific private data object in the RM demuxer.Ronald S. Bultje2008-12-28
| | | | | | | This allows multiple video or audio streams per .rm file. See mailinglist thread "[PATCH] rmdec.c: implement RMVideo/AudioStream". Originally committed as revision 16365 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use get_buffer() and url_fskip() for some loops of get_byte()s. See ↵Ronald S. Bultje2008-12-14
| | | | | | | | discussion in ML thread "[PATCH] rmdec.c: use get_buffer and skip_bytes instead of loops of get_byte". Originally committed as revision 16139 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent something that looks weird.Ronald S. Bultje2008-12-14
| | | | Originally committed as revision 16138 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.Ronald S. Bultje2008-12-13
| | | | | | | | Reason for this is that there are no shared entries in the demuxer/muxer context, making it a mystery as to why it was shared between the two. See "[PATCH] clean rmdemux/muxcontext" patch on mailinglist. Originally committed as revision 16111 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Don't access RMContext directly in rdt.c. Rather, use the return value ofRonald S. Bultje2008-12-13
| | | | | | | | | ff_rm_parse_packet() to indicate whether more audio packets are available in the demuxer from the last RM frame, and save that in the RDT parsing context. See patch/discussion in "[PATCH] rdt.c: don't access RMContext" on ML. Originally committed as revision 16110 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix indenting.Ronald S. Bultje2008-12-11
| | | | Originally committed as revision 16056 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ByteIOContext argument to public ff_rm_* functions so that we canRonald S. Bultje2008-11-17
| | | | | | | | specify the data source as function argument instead of in s->pb before calling the function. Discussed in ML thread "[PATCH] fix small memleak in rdt.c". Originally committed as revision 15849 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check sub_packet_size against 0 to avoid div by zero later.Michael Niedermayer2008-10-29
| | | | | | Fixes issue473 Originally committed as revision 15739 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add ok parts to the rm demuxer for SIPRO supportBenjamin Larsson2008-09-26
| | | | Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for RVTR fourCCVitor Sessak2008-09-23
| | | | Originally committed as revision 15386 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add dynamic payload handlers to rdt.c. These follow the same API as the onesRonald S. Bultje2008-09-07
| | | | | | | | | | | | | | | | | | in rtpdec.c, so that they can be shared and used in the same way in rtsp.c. The handlers, since they are specific for RDT, are registered in rdt.c and a new registration function is thus called from allformats.c. The dynamic payload handler also implements RDT-specific SDP-line parsing for OpaqueData and StartTime, which are specific for RDT and needed for proper playback. OpaqueData contains one or a list ("MLTI") of "MDPR" chunks that can be parsed by the rmdec.c function ff_rm_read_mdpr_codecdata(). To use this function, we create a new rdt_demuxer, which has the same private data as the rm_demuxer. The resulting AVFormatContext created with _open_stream() can thus be used to call functions in the RM demuxer. See discussion in "Realmedia patch" thread on ML. Originally committed as revision 15234 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it isRonald S. Bultje2008-09-03
| | | | | | | shared between the RM demuxer and the RTSP/RDT parser; both use the same timebase. See discussion in "[PATCH] rmdec.c: move av_set_pts_info()" on ML. Originally committed as revision 15164 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use chunk-size in function calling mdpr_read_codecdata() rather than in theRonald S. Bultje2008-09-03
| | | | | | | | | function itself. This way, old-style (.ra4) RTSP/RDT OpaqueData chunks can be parsed using this function as well (they don't have the size bits). See discussion on ML in "[PATCH] rmdec.c - small read_mdpr_codecdata() API modification". Originally committed as revision 15163 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused variable, fixes the warning:Diego Biurrun2008-06-23
| | | | | | libavformat/rmdec.c:280: warning: unused variable 'i' Originally committed as revision 13909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* factorize read_header failure freeing codeBaptiste Coudurier2008-06-20
| | | | Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.Stefano Sabatini2008-06-03
| | | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste.it along with some spelling/consistency fixes for the long names by me Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check whether the memory allocation for extradata succeeded. Fixes issue 472.Panagiotis Issaris2008-06-01
| | | | Originally committed as revision 13603 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-09
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix seeking in rm.Michael Niedermayer2008-04-09
| | | | Originally committed as revision 12779 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix forgotten braces from r11039Roberto Togni2008-01-17
| | | | Originally committed as revision 11552 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove some spaces to keep certain people's eyes from hurting.Diego Biurrun2008-01-16
| | | | Originally committed as revision 11544 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Add another pair of parentheses to aid readability.Diego Biurrun2008-01-06
| | | | Originally committed as revision 11437 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make three rm demuxer functions non static.Ronald S. Bultje2008-01-04
| | | | | | | | Patch by Ronald S. Bultje rsbultje gmail com Original thread: [FFmpeg-devel] [PATCH] Realmedia / RTSP (RDT) Date: 12/28/2007 10:19 PM Originally committed as revision 11392 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Reindent.Diego Biurrun2008-01-02
| | | | Originally committed as revision 11375 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge double-nested if into && condition.Ronald S. Bultje2008-01-02
| | | | | | patch by Ronald S. Bultje, rsbultje gmail com Originally committed as revision 11374 to svn://svn.ffmpeg.org/ffmpeg/trunk
* TypoRoberto Togni2007-12-04
| | | | Originally committed as revision 11165 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 12:58:39 +0000