wma: Rename comment_header.

[paraslash.git] / wma_afh.c

diff --git a/wma_afh.c b/wma_afh.c
index 255342dca56d4f8b8ff5a7bea199b78c76c5e55d..f1edacf07aa56b2d26e54e54641c1fd3d6bc1f11 100644 (file)
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -1,19 +1,12 @@
 /*
 /*

- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file wma_afh.c The audio format handler for WMA files. */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file wma_afh.c The audio format handler for WMA files. */
 

-#include <stdlib.h>
-#include <inttypes.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>

 #include <regex.h>
 
 #include "para.h"
 #include <regex.h>
 
 #include "para.h"


@@ -107,7 +100,7 @@ static char *get_str16(const char *in, int len)
        return out;
 }
 
        return out;
 }
 

-static const char comment_header[] = {
+static const char content_description_header[] = {

        0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11,
        0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
 };
        0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11,
        0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
 };


@@ -132,12 +125,12 @@ static const char album_tag_header[] = { /* WM/AlbumTitle */
 static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
 {
        const char *p, *end = buf + buf_size, *q;
 static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
 {
        const char *p, *end = buf + buf_size, *q;

-       uint16_t len1, len2, len3, len4, len5;
+       uint16_t len1, len2, len3, len4;

 
 

-       p = search_pattern(comment_header, sizeof(comment_header),
-               buf, buf_size);
+       p = search_pattern(content_description_header,
+               sizeof(content_description_header), buf, buf_size);

        if (!p || p + 34 >= end) {
        if (!p || p + 34 >= end) {

-               PARA_NOTICE_LOG("comment header not found\n");
+               PARA_NOTICE_LOG("content description header not found\n");

                goto next;
        }
        p += 24;
                goto next;
        }
        p += 24;


@@ -149,7 +142,7 @@ static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
        p += 2;
        len4 = read_u16(p);
        p += 2;
        p += 2;
        len4 = read_u16(p);
        p += 2;

-       len5 = read_u16(p);
+       /* ignore length of the rating information */

        p += 2;
        if (p + len1 >= end)
                goto next;
        p += 2;
        if (p + len1 >= end)
                goto next;


@@ -158,10 +151,10 @@ static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
        if (p + len2 >= end)
                goto next;
        ti->artist = get_str16(p, len2);
        if (p + len2 >= end)
                goto next;
        ti->artist = get_str16(p, len2);

-       p += len2 + len3 + len4;
-       if (p + len5 >= end)
+       p += len2 + len3;
+       if (p + len4 >= end)

                goto next;
                goto next;

-       ti->comment = get_str16(p, len5);
+       ti->comment = get_str16(p, len4);

 next:
        p = search_pattern(extended_content_header, sizeof(extended_content_header),
                buf, buf_size);
 next:
        p = search_pattern(extended_content_header, sizeof(extended_content_header),
                buf, buf_size);


@@ -257,6 +250,15 @@ static int wma_get_file_info(char *map, size_t numbytes, __a_unused int fd,
        afhi->frequency = ahi.sample_rate;
        afhi->channels = ahi.channels;
        afhi->header_len = ahi.header_len;
        afhi->frequency = ahi.sample_rate;
        afhi->channels = ahi.channels;
        afhi->header_len = ahi.header_len;

+
+       afhi->techinfo = make_message("%s%s%s%s%s",
+               ahi.use_exp_vlc? "exp vlc" : "",
+               (ahi.use_bit_reservoir && ahi.use_exp_vlc)? ", " : "",
+               ahi.use_bit_reservoir? "bit reservoir" : "",
+               (ahi.use_variable_block_len &&
+                       (ahi.use_exp_vlc || ahi.use_bit_reservoir)? ", " : ""),
+               ahi.use_variable_block_len? "vbl" : ""
+       );

        wma_make_chunk_table(map + ahi.header_len, numbytes - ahi.header_len,
                ahi.block_align, afhi);
        read_asf_tags(map, ahi.header_len, &afhi->tags);
        wma_make_chunk_table(map + ahi.header_len, numbytes - ahi.header_len,
                ahi.block_align, afhi);
        read_asf_tags(map, ahi.header_len, &afhi->tags);