From: Vadim Belov vad...@vadimb-t440.nice.com
---
libavformat/asf.h | 8 +-
libavformat/asf_ex.h| 29 ++--
libavformat/asf_trim.c | 366
libavformat/asf_trim.h | 42 +++---
libavformat/asfdec.c| 24 ++--
libavformat/asfenc.c| 105 +++---
libavformat/concatdec.c | 2 +-
7 files changed, 298 insertions(+), 278 deletions(-)
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 7e8d8d3..0ef4ea6 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -29,7 +29,9 @@
#define PACKET_SIZE 3200
-// asf_ex.h is IMPORTANT to be placed After PACKET_SIZE definition
+/**
+ * asf_ex.h is IMPORTANT to be placed After PACKET_SIZE definition
+ */
#include asf_ex.h
typedef struct ASFPayload {
@@ -61,9 +63,9 @@ typedef struct ASFStream {
uint32_t palette[256];
int payload_ext_ct;
-ASFPayload payload[8];
+ASFPayload payload[8];
- ASFIndexData idx_data;
+ASFIndexData idx_data;
} ASFStream;
typedef struct ASFMainHeader {
diff --git a/libavformat/asf_ex.h b/libavformat/asf_ex.h
index 6655424..480105a 100644
--- a/libavformat/asf_ex.h
+++ b/libavformat/asf_ex.h
@@ -1,4 +1,8 @@
-/*
+/**
+ * @file asf_ex.h
+ * Extensions to ASF handling
+ * @author Vadim Belov
+ *
* Copyright (c) 2015 Vadim Belov
*
* This file is part of FFmpeg.
@@ -23,9 +27,12 @@
#include stdint.h
-// Packet size according to the size that ACX File Creator writes to its
output packets:
-// ASF_PACKET_SIZE is 8192, but in CASFFile::InitAsfPckt it is decremented.
-// Bottom line: in the ASF core file the value is 8032
+/**
+ * Packet size according to the size that Custom ASF File Creator writes
+ * to its output packets:
+ * ASF_PACKET_SIZE is 8192, but is decremented later.
+ * Final result: in the ASF core file the value is 8032
+ */
#ifdef PACKET_SIZE
#undef PACKET_SIZE
#endif
@@ -36,16 +43,16 @@
#define NO_STREAM_DIRECTION -1
#define ASF_MAX_STREAMS_NUM 128
-typedef struct ASFStreamIndex { // Index Entry value
- uint64_t offset;
+typedef struct ASFStreamIndex { // Index Entry value
+uint64_t offset;
} ASFStreamIndex;
typedef struct ASFIndexData {
- ASFStreamIndex* indices;// array of ASFStreamIndex
- uint32_t indices_max_count; // allocated size
- uint32_t next_duration_mark; // for next index
- uint32_t indices_count; // current index
- int64_t duration_overall;
+ASFStreamIndex* indices; // array of ASFStreamIndex
+uint32_t indices_max_count; // allocated size
+uint32_t next_duration_mark; // for next index
+uint32_t indices_count; // current index
+int64_t duration_overall;
} ASFIndexData;
#endif /* AVFORMAT_ASF_EX_H */
diff --git a/libavformat/asf_trim.c b/libavformat/asf_trim.c
index 60017e4..ce75170 100644
--- a/libavformat/asf_trim.c
+++ b/libavformat/asf_trim.c
@@ -1,21 +1,25 @@
/*
-* Copyright (c) 2015 Vadim Belov
-*
-* This file is part of FFmpeg.
-*
-* FFmpeg 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,
-* 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
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * @file asf_trim.c
+ * Extensions to ASF handling
+ * @author Vadim Belov
+ *
+ * Copyright (c) 2015 Vadim Belov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include asf_trim.h
@@ -23,202 +27,202 @@
#define ASF_INDEX_ENTRY_TIME_INTERVAL 1
#define SPECIFIER_INDEX_TYPE 3
-#define BLOCK_PART 0x
-#define OFFSET_PART0x
-#define INVALID_OFFSET 0x
+#define BLOCK_PART 0x
+#define OFFSET_PART 0x
+#define
