flvdec: read index stored in the 'keyframes' tag.

[ffmpeg] / libavformat / spdifenc.c

diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index adc245a3314c1f93798d9a74beb9e5954e60c4ba..35c7b162fb406b6f88ded4f59bfd185204d06a59 100644 (file)
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -4,20 +4,20 @@
  * Copyright (c) 2010 Anssi Hannula
  * Copyright (c) 2010 Carl Eugen Hoyos
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -45,6 +45,7 @@
  */
 
 #include "avformat.h"
+#include "avio_internal.h"
 #include "spdif.h"
 #include "libavcodec/ac3.h"
 #include "libavcodec/dca.h"
@@ -142,24 +143,15 @@ static int spdif_header_eac3(AVFormatContext *s, AVPacket *pkt)
  * the outputted IEC 61937 stream is higher.
  * The repetition period is measured in IEC 60958 frames (4 bytes).
  */
-enum {
-    DTS4_REP_PER_512   = 0x0,
-    DTS4_REP_PER_1024  = 0x1,
-    DTS4_REP_PER_2048  = 0x2,
-    DTS4_REP_PER_4096  = 0x3,
-    DTS4_REP_PER_8192  = 0x4,
-    DTS4_REP_PER_16384 = 0x5,
-};
-
 static int spdif_dts4_subtype(int period)
 {
     switch (period) {
-    case 512:   return DTS4_REP_PER_512;
-    case 1024:  return DTS4_REP_PER_1024;
-    case 2048:  return DTS4_REP_PER_2048;
-    case 4096:  return DTS4_REP_PER_4096;
-    case 8192:  return DTS4_REP_PER_8192;
-    case 16384: return DTS4_REP_PER_16384;
+    case 512:   return 0x0;
+    case 1024:  return 0x1;
+    case 2048:  return 0x2;
+    case 4096:  return 0x3;
+    case 8192:  return 0x4;
+    case 16384: return 0x5;
     }
     return -1;
 }
@@ -212,7 +204,8 @@ static int spdif_header_dts4(AVFormatContext *s, AVPacket *pkt, int core_size,
         if (ctx->dtshd_fallback > 0)
             ctx->dtshd_skip = sample_rate * ctx->dtshd_fallback / (blocks << 5);
         else
-            /* skip permanently (-1) or just once (0) */
+            /* skip permanently (dtshd_fallback == -1) or just once
+             * (dtshd_fallback == 0) */
             ctx->dtshd_skip = 1;
     }
     if (ctx->dtshd_skip && core_size) {
@@ -224,8 +217,7 @@ static int spdif_header_dts4(AVFormatContext *s, AVPacket *pkt, int core_size,
     ctx->out_bytes   = sizeof(dtshd_start_code) + 2 + pkt_size;
     ctx->length_code = ctx->out_bytes;
 
-    ctx->hd_buf = av_fast_realloc(ctx->hd_buf, &ctx->hd_buf_size,
-                                  ctx->out_bytes);
+    av_fast_malloc(&ctx->hd_buf, &ctx->hd_buf_size, ctx->out_bytes);
     if (!ctx->hd_buf)
         return AVERROR(ENOMEM);
 
@@ -482,12 +474,12 @@ static int spdif_write_trailer(AVFormatContext *s)
 }
 
 static av_always_inline void spdif_put_16(IEC61937Context *ctx,
-                                          ByteIOContext *pb, unsigned int val)
+                                          AVIOContext *pb, unsigned int val)
 {
     if (ctx->spdif_flags & SPDIF_FLAG_BIGENDIAN)
-        put_be16(pb, val);
+        avio_wb16(pb, val);
     else
-        put_le16(pb, val);
+        avio_wl16(pb, val);
 }
 
 static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
@@ -521,25 +513,25 @@ static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     }
 
     if (ctx->extra_bswap ^ (ctx->spdif_flags & SPDIF_FLAG_BIGENDIAN)) {
-    put_buffer(s->pb, ctx->out_buf, ctx->out_bytes & ~1);
+    avio_write(s->pb, ctx->out_buf, ctx->out_bytes & ~1);
     } else {
     av_fast_malloc(&ctx->buffer, &ctx->buffer_size, ctx->out_bytes + FF_INPUT_BUFFER_PADDING_SIZE);
     if (!ctx->buffer)
         return AVERROR(ENOMEM);
     ff_spdif_bswap_buf16((uint16_t *)ctx->buffer, (uint16_t *)ctx->out_buf, ctx->out_bytes >> 1);
-    put_buffer(s->pb, ctx->buffer, ctx->out_bytes & ~1);
+    avio_write(s->pb, ctx->buffer, ctx->out_bytes & ~1);
     }
 
     /* a final lone byte has to be MSB aligned */
     if (ctx->out_bytes & 1)
         spdif_put_16(ctx, s->pb, ctx->out_buf[ctx->out_bytes - 1] << 8);
 
-    put_nbyte(s->pb, 0, padding);
+    ffio_fill(s->pb, 0, padding);
 
     av_log(s, AV_LOG_DEBUG, "type=%x len=%i pkt_offset=%i\n",
            ctx->data_type, ctx->out_bytes, ctx->pkt_offset);
 
-    put_flush_packet(s->pb);
+    avio_flush(s->pb);
     return 0;
 }
 
@@ -554,5 +546,6 @@ AVOutputFormat ff_spdif_muxer = {
     spdif_write_header,
     spdif_write_packet,
     spdif_write_trailer,
+    .flags = AVFMT_NOTIMESTAMPS,
     .priv_class = &class,
 };