generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove is_playing variable.

Browse Source 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zhentan Feng 2010-08-04 22:33:38 +00:00 committed by Ronald S. Bultje
parent b949875bf6
commit 05fc9a1bcf
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/mmst.c
View File

@ -124,7 +124,6 @@ typedef struct {
/*@}*/ /*@}*/
int stream_num; ///< stream numbers. int stream_num; ///< stream numbers.
int is_playing;
} MMSContext; } MMSContext;
/** Create MMST command packet header */ /** Create MMST command packet header */
@ -552,7 +551,7 @@ static int read_mms_packet(MMSContext *mms, uint8_t *buf, int buf_size)
int size_to_copy; int size_to_copy;
do { do {
if(mms->asf_header_read_size < mms->asf_header_size && !mms->is_playing) { if(mms->asf_header_read_size < mms->asf_header_size) {
/* Read from ASF header buffer */ /* Read from ASF header buffer */
size_to_copy= FFMIN(buf_size, size_to_copy= FFMIN(buf_size,
mms->asf_header_size - mms->asf_header_read_size); mms->asf_header_size - mms->asf_header_read_size);
@ -563,7 +562,6 @@ static int read_mms_packet(MMSContext *mms, uint8_t *buf, int buf_size)
size_to_copy, mms->asf_header_size - mms->asf_header_read_size); size_to_copy, mms->asf_header_size - mms->asf_header_read_size);
if (mms->asf_header_size == mms->asf_header_read_size) { if (mms->asf_header_size == mms->asf_header_read_size) {
av_freep(&mms->asf_header); av_freep(&mms->asf_header);
mms->is_playing = 1;
} }
} else if(mms->remaining_in_len) { } else if(mms->remaining_in_len) {
/* Read remaining packet data to buffer. /* Read remaining packet data to buffer.
@ -701,6 +699,15 @@ static int mms_open(URLContext *h, const char *uri, int flags)
if (!mms->asf_packet_len || !mms->stream_num) if (!mms->asf_packet_len || !mms->stream_num)
goto fail; goto fail;
clear_stream_buffers(mms);
err = mms_safe_send_recv(mms, send_stream_selection_request, SC_PKT_STREAM_ID_ACCEPTED);
if (err)
goto fail;
// send media packet request
err = mms_safe_send_recv(mms, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS);
if (err) {
goto fail;
}
dprintf(NULL, "Leaving open (success)\n"); dprintf(NULL, "Leaving open (success)\n");
return 0; return 0;
fail: fail:
@ -714,23 +721,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
{ {
/* TODO: see tcp.c:tcp_read() about a possible timeout scheme */ /* TODO: see tcp.c:tcp_read() about a possible timeout scheme */
MMSContext *mms = h->priv_data; MMSContext *mms = h->priv_data;
int result = 0;
/* Since we read the header at open(), this shouldn't be possible */
assert(mms->header_parsed);
if (!mms->is_playing) {
dprintf(NULL, "mms_read() before play().\n");
clear_stream_buffers(mms);
result = mms_safe_send_recv(mms, send_stream_selection_request, SC_PKT_STREAM_ID_ACCEPTED);
if (result)
return result;
// send media packet request
result = mms_safe_send_recv(mms, send_media_packet_request, SC_PKT_MEDIA_PKT_FOLLOWS);
if (result) {
return result;
}
}
return read_mms_packet(mms, buf, size); return read_mms_packet(mms, buf, size);
} }