[vlc-commits] hds: simplify pf_read()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 24 22:30:53 2015 +0300| [73dec06b9f40878231296ca6dadf0dbf4b45318f] | committer: Rémi Denis-Courmont

hds: simplify pf_read()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73dec06b9f40878231296ca6dadf0dbf4b45318f
---

 modules/stream_filter/hds/hds.c |   39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c
index 915f2eb..aa3250f 100644
--- a/modules/stream_filter/hds/hds.c
+++ b/modules/stream_filter/hds/hds.c
@@ -1736,9 +1736,7 @@ static int send_flv_header( hds_stream_t *stream, stream_sys_t* p_sys,
 static unsigned read_chunk_data(
     vlc_object_t* p_this,
     uint8_t* buffer, unsigned read_len,
-    hds_stream_t* stream,
-    bool* eof
-    )
+    hds_stream_t* stream )
 {
     stream_t* s = (stream_t*) p_this;
     stream_sys_t* sys = s->p_sys;
@@ -1746,10 +1744,8 @@ static unsigned read_chunk_data(
     uint8_t* buffer_start = buffer;
     bool dl = false;
 
-    if( chunk && chunk->eof && chunk->mdat_pos >= chunk->mdat_len ) {
-        *eof = true;
+    if( chunk && chunk->eof && chunk->mdat_pos >= chunk->mdat_len )
         return 0;
-    }
 
     while( chunk && chunk->data && read_len > 0 && ! (chunk->eof && chunk->mdat_pos >= chunk->mdat_len ) )
     {
@@ -1773,11 +1769,6 @@ static unsigned read_chunk_data(
 
         if( ! sys->live && (chunk->mdat_pos >= chunk->mdat_len || chunk->failed) )
         {
-            if( chunk->eof )
-            {
-                *eof = true;
-            }
-
             /* make sure there is at least one chunk in the queue */
             if( ! chunk->next && ! chunk->eof )
             {
@@ -1847,32 +1838,18 @@ static ssize_t Read( stream_t *s, void *buffer, size_t i_read )
 
     if ( vlc_array_count( p_sys->hds_streams ) == 0 )
         return 0;
+    if( unlikely(i_read == 0) )
+        return 0;
 
     // TODO: change here for selectable stream
     hds_stream_t *stream = s->p_sys->hds_streams->pp_elems[0];
-    int length = 0;
-
-    uint8_t *buffer_uint8 = (uint8_t*) buffer;
 
     if ( header_unfinished( p_sys ) )
-    {
-        unsigned hdr_bytes = send_flv_header( stream, p_sys, buffer, i_read );
-        length += hdr_bytes;
-        i_read -= hdr_bytes;
-        buffer_uint8 += hdr_bytes;
-    }
-
-    bool eof = false;
-    while( i_read > 0 && ! eof )
-    {
-        int tmp_length = read_chunk_data( (vlc_object_t*)s, buffer_uint8, i_read, stream, &eof );
-        buffer_uint8 += tmp_length;
-        i_read -= tmp_length;
-        length += tmp_length;
-        p_sys->playback_offset += tmp_length;
-    }
+        return send_flv_header( stream, p_sys, buffer, i_read );
 
-    return length;
+    i_read = read_chunk_data( (vlc_object_t*)s, buffer, i_read, stream );
+    p_sys->playback_offset += i_read;
+    return i_read;
 }
 
 static int Control( stream_t *s, int i_query, va_list args )