diff mbox series

[FFmpeg-devel] export mime_type of data urls

Message ID eb370cec-fa04-de6e-c847-72f5e78abaa5@gmail.com
State New
Headers show
Series [FFmpeg-devel] export mime_type of data urls | expand

Checks

Context Check Description
andriy/configure_x86 warning Failed to apply patch

Commit Message

David Lou July 3, 2023, 1:50 a.m. UTC 
Fix the fact that ffprobe no longer detect m3u8 in a data url correctly.

For example,

ffprobe 
data:application/vnd.apple.mpegurl;base64,I0VYVE0zVQojRVhULVgtVkVSU0lPTjozCiNFWFQtWC1UQVJHRVREVVJBVElPTjozMAojRVhUSU5GOjMwLApodHRwczovL2Rvd25sb2FkLnNhbXBsZWxpYi5jb20vbXA0L3NhbXBsZS0zMHMubXA0

This provides the mime_type hls detection requires.


Signed-off-by: David Lou <morphological.arts@gmail.com>
---
  libavformat/data_uri.c | 37 ++++++++++++++++++++++++++++++-------
  1 file changed, 30 insertions(+), 7 deletions(-)

                  return AVERROR(EINVAL);
              }
-            av_log(h, AV_LOG_VERBOSE, "Content-type: %.*s\n",
-                   (int)(next - opt), opt);
+            av_free(dc->mime_type);
+            dc->mime_type = av_strndup(opt, (int)(next - opt));
+            av_log(h, AV_LOG_VERBOSE, "Content-type: %s\n",
+                   dc->mime_type);
          } else {
              if (!av_strncasecmp(opt, "base64", next - opt)) {
                  base64 = 1;
@@ -110,10 +118,25 @@ static int data_read(URLContext *h, unsigned char 
*buf, int size)
      return size;
  }
  +#define OFFSET(x) offsetof(DataContext, x)
+
+static const AVOption options[] = {
+    { "mime_type", "export the MIME type", OFFSET(mime_type), 
AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | 
AV_OPT_FLAG_READONLY },
+    { NULL }
+};
+
+static const AVClass data_context_class = {
+    .class_name = "data",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
  const URLProtocol ff_data_protocol = {
-    .name           = "data",
-    .url_open       = data_open,
-    .url_close      = data_close,
-    .url_read       = data_read,
-    .priv_data_size = sizeof(DataContext),
+    .name               = "data",
+    .url_open           = data_open,
+    .url_close          = data_close,
+    .url_read           = data_read,
+    .priv_data_size     = sizeof(DataContext),
+    .priv_data_class    = &data_context_class,
  };
diff mbox series

Patch

diff --git a/libavformat/data_uri.c b/libavformat/data_uri.c
index 28eb2b9e08..fdc1a2eef9 100644
--- a/libavformat/data_uri.c
+++ b/libavformat/data_uri.c
@@ -19,18 +19,24 @@ 
   */
   #include <string.h>
+
  #include "libavutil/avstring.h"
  #include "libavutil/avutil.h"
  #include "libavutil/base64.h"
+#include "libavutil/opt.h"
+
  #include "url.h"
   typedef struct {
+    const AVClass *class;
      const uint8_t *data;
      void *tofree;
      size_t size;
      size_t pos;
+    char *mime_type;
  } DataContext;
  +
  static av_cold int data_open(URLContext *h, const char *uri, int flags)
  {
      DataContext *dc = h->priv_data;
@@ -56,8 +62,10 @@  static av_cold int data_open(URLContext *h, const 
char *uri, int flags)
                         (int)(next - opt), opt);