summaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * rtmpproto: Readjust the end of the flv buffer if handle_metadata exited earlyMartin Storsjö2013-10-041-0/+5
| | | | | | | | | | | | | | | | If the embedded flv packets were incomplete and we aborted the copying loop early, make sure the flv buffer is trimmed to only contain full packets. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '24fee95321c1463360ba7042d026dae021854360'Michael Niedermayer2013-10-041-4/+3
|\| | | | | | | | | | | | | * commit '24fee95321c1463360ba7042d026dae021854360': rtmpproto: Move the flv header/trailer addition to append_flv_data Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Move the flv header/trailer addition to append_flv_dataMartin Storsjö2013-10-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_offset is also called from handle_metadata, where the packet header sizes is already included in the size. Previously this lead to flv_data/flv_size including 15 uninitialized bytes at the end after each call to handle_metadata, making the flv demuxer lose sync with the stream. Also remove leftover copying in handle_metadata. This is a leftover from the refactoring in 5840473. (Previously this final mempcy was the one that copied all the packets at once, while this is done within the loop right now.) After making sure flv_size is set to the right size, this write was out of bounds. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'Michael Niedermayer2013-10-041-2/+6
|\| | | | | | | | | | | | | * commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8': rtmpproto: Clear the flv allocation size on reallocp failures Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Clear the flv allocation size on reallocp failuresMartin Storsjö2013-10-041-2/+6
| | | | | | | | | | | | | | This was overlooked in d872fb0f7 since I assumed all the realloc issues in the rtmp code was fixed already. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'Michael Niedermayer2013-10-041-1/+1
|\| | | | | | | | | | | | | * commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f': rtmpproto: Pass the 'live' parameter in the right unit Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Pass the 'live' parameter in the right unitMartin Storsjö2013-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | The current magic numbers passed are values in seconds, while the parameter itself should be passed over the wire in milliseconds. This makes (some/all?) live streams from Red5 work correctly, that previously returned StreamNotFound even with "-rtmp_live live". After this commit, the default 'any' also works on these streams. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'Michael Niedermayer2013-10-041-2/+6
|\| | | | | | | | | | | | | * commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb': rtmpproto: Print the error code string if there's no description Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Print the error code string if there's no descriptionMartin Storsjö2013-10-041-2/+6
| | | | | | | | | | | | | | | | | | | | On (certain streams/setups at least on) Red5, the description string actually is present, but empty. Therefore, first try loading the description, but if not found or empty, load the code string instead. The code string is quite understandable in most cases anyway (like "NetStream.Play.StreamNotFound"). Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-021-0/+1
|\| | | | | | | | | | | | | * qatar/master: rtmp: alias rtmp_listen to listen Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: alias rtmp_listen to listenLuca Barbato2013-10-011-0/+1
| | | | | | | | Make it uniform with the other protocols.
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-271-1/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'Michael Niedermayer2013-09-231-7/+8
|\| | | | | | | | | | | | | * commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6': rtmp: Replace a magic number with a macro Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Replace a magic number with a macroLuca Barbato2013-09-221-7/+8
| | | | | | | | 11 is the RTMP header size.
* | Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'Michael Niedermayer2013-09-231-28/+42
|\| | | | | | | | | | | | | * commit '5840473890440dbe0bd2cce530ebb3d93e187ae6': rtmp: Rewrite embedded flv handling Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Rewrite embedded flv handlingLuca Barbato2013-09-221-28/+42
| | | | | | | | | | | | Use update_offset() as done for rtmp audio, video and notifications and read update and write the fields instead of replacing them in the rtmp packet and then memcpying it to the output buffer.
* | Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'Michael Niedermayer2013-09-231-62/+51
|\| | | | | | | | | | | | | * commit 'e40a0e822801d2485e4e555909d7a82713fa86a5': rtmp: Refactor get_packet Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Refactor get_packetLuca Barbato2013-09-221-62/+51
| |
* | Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'Michael Niedermayer2013-09-201-8/+9
|\| | | | | | | | | | | | | * commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91': rtmp: Unbreak get_packet Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Unbreak get_packetLuca Barbato2013-09-201-8/+9
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'Michael Niedermayer2013-09-201-0/+2
|\| | | | | | | | | | | | | * commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4': rtmpproto: Add a comment explaining the logic in handle_notify Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Add a comment explaining the logic in handle_notifyMartin Storsjö2013-09-201-0/+2
| | | | | | | | | | | | | | This explains why the cleanup in 5626f994f was wrong and why ae0f316a was needed. Signed-off-by: Martin Storsjö <[email protected]>
| * rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-33/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-33/+33
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '8583b14252deac71136f1dec231910abab0ba503'Michael Niedermayer2013-09-181-1/+4
|\| | | | | | | | | | | | | * commit '8583b14252deac71136f1dec231910abab0ba503': rtmp: Support reading interleaved chunks. Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Support reading interleaved chunks.Josh Allmann2013-09-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A given packet won't always come in contiguously; sometimes they may be broken up on chunk boundaries by packets of another channel. This support primarily involves tracking information about the data that's been read, so the reader can pick up where it left off for a given channel. As a side effect, we no longer over-report the bytes read if (toread = MIN(size, chunk_size)) == size Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6': rtmpproto: Extend a comment to explain the prev_pkt arrays roles Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Extend a comment to explain the prev_pkt arrays rolesMartin Storsjö2013-09-171-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '647d655d19c38e9716328e4787199149097d6089'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit '647d655d19c38e9716328e4787199149097d6089': rtmpproto: Consistently use the right prev_pkt array Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Consistently use the right prev_pkt arrayMartin Storsjö2013-09-171-1/+1
| | | | | | | | | | | | | | prev_pkt[0] is used for input packets, while prev_pkt[1] is used for output. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '0d3784396b736374a61fea26268febdabd803a59'Michael Niedermayer2013-09-181-1/+1
|\| | | | | | | | | | | | | * commit '0d3784396b736374a61fea26268febdabd803a59': rtmpproto: Check for the right return code Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: Check for the right return codeMartin Storsjö2013-09-171-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-171-8/+8
|\| | | | | | | | | | | | | * qatar/master: rtmp: rename main_channel_id to stream_id. Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: rename main_channel_id to stream_id.Josh Allmann2013-09-171-8/+8
| | | | | | | | | | | | | | This more closely corresponds to the usage of the field. Its usage here is unrelated to the channel ID. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'Michael Niedermayer2013-09-171-2/+2
|\| | | | | | | | | | | | | * commit 'd4aef997809167832ecc64e89dda8cb445e5fe10': rtmp: Follow Flash player numbering for channels. Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Follow Flash player numbering for channels.Josh Allmann2013-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | Channel 4 is typically used by the Flash player to transmit audio, channel 6 for video, and various stream-specific invokes get sent over channel 8, which is designated the source channel. This more closely matches the behavior of the Flash player, including the transmission of play requests over channel 8. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'Michael Niedermayer2013-09-171-2/+6
|\| | | | | | | | | | | | | * commit '120af23cd5fcfc539d9575d17d403247ab17109b': rtmp: Send video on a separate channel. Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Send video on a separate channel.Josh Allmann2013-09-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | Sending non-monotonic packets (e.g. when the audio and video streams are monotonic within themselves but not muxed monotonically) will lead to negative values the RTMP timestamp field (where timestamps are transmitted only as deltas for each channel), and this delta can end up being incorrectly written as a large unsigned number. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'Michael Niedermayer2013-09-171-30/+29
|\| | | | | | | | | | | | | * commit '92ed83e393d25b6d15920e90d56ee77de54a9728': rtmp: Store all the notify messages Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Store all the notify messagesLuca Barbato2013-09-161-30/+29
| | | | | | | | The onTextData is used to implement text data streams in flv.
* | Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'Michael Niedermayer2013-09-171-1/+1
|\| | | | | | | | | | | | | * commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931': rtmp: Do not send the first field twice within the handshake Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Do not send the first field twice within the handshakeLuca Barbato2013-09-161-1/+1
| |
* | Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'Michael Niedermayer2013-09-171-2/+0
|\| | | | | | | | | | | | | * commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf': rtmp: Drop an unneeded warning Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Drop an unneeded warningLuca Barbato2013-09-161-2/+0
| | | | | | | | | | Apparently a widely used streaming server requires that the second field always presents a version during C1 phase.
* | Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'Michael Niedermayer2013-09-171-1/+10
|\| | | | | | | | | | | | | * commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825': rtmp: Support play method in listen mode Merged-by: Michael Niedermayer <[email protected]>
| * rtmp: Support play method in listen modeLuca Barbato2013-09-161-1/+10
| |
* | Merge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'Michael Niedermayer2013-09-171-43/+75
|\| | | | | | | | | | | | | * commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a': rtmp: Factor out publish specific code Merged-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 05:59:55 +0000