Revert "Create three ogg pages when skipping vorbis comments."

[paraslash.git] / ogg_afh_common.c

diff --git a/ogg_afh_common.c b/ogg_afh_common.c
index 777e2138ec3f858b5fe14e5706e9f74806944821..ad5963ebc1488ca32d6c2055ee5009fd377d4c8c 100644 (file)
--- a/ogg_afh_common.c
+++ b/ogg_afh_common.c
@@ -32,19 +32,15 @@ static int process_packets_2_and_3(ogg_sync_state *oss,
                                break; /* Need more data */
                        if (ret != 1)
                                continue;
                                break; /* Need more data */
                        if (ret != 1)
                                continue;

-                       PARA_DEBUG_LOG("next input page (header/body): %lu/%lu\n",
-                               page.header_len, page.body_len);

                        /*
                         * We can ignore any errors here as they'll also become
                         * apparent at packetout.
                         */
                        ogg_stream_pagein(stream, &page);
                        /*
                         * We can ignore any errors here as they'll also become
                         * apparent at packetout.
                         */
                        ogg_stream_pagein(stream, &page);

-                       PARA_DEBUG_LOG("ogg page serial: %d\n",
+                       PARA_INFO_LOG("ogg page serial: %d\n",

                                ogg_page_serialno(&page));
                        while (i < 2) {
                                ret = ogg_stream_packetout(stream, &packet);
                                ogg_page_serialno(&page));
                        while (i < 2) {
                                ret = ogg_stream_packetout(stream, &packet);

-                               PARA_DEBUG_LOG("packet #%d: %lu bytes\n", i + 1,
-                                       packet.bytes);

                                if (ret == 0)
                                        break;
                                if (ret < 0)
                                if (ret == 0)
                                        break;
                                if (ret < 0)


@@ -73,8 +69,6 @@ static int process_ogg_packets(ogg_sync_state *oss, struct afh_info *afhi,
 
        if (ogg_sync_pageout(oss, &page) != 1)
                return -E_SYNC_PAGEOUT;
 
        if (ogg_sync_pageout(oss, &page) != 1)
                return -E_SYNC_PAGEOUT;

-       PARA_DEBUG_LOG("first input page (header/body): %lu/%lu\n",
-               page.header_len, page.body_len);

 
        ret = ogg_page_serialno(&page);
        ogg_stream_init(&stream, ret);
 
        ret = ogg_page_serialno(&page);
        ogg_stream_init(&stream, ret);


@@ -86,7 +80,6 @@ static int process_ogg_packets(ogg_sync_state *oss, struct afh_info *afhi,
        ret = -E_STREAM_PACKETOUT;
        if (ogg_stream_packetout(&stream, &packet) != 1)
                goto out;
        ret = -E_STREAM_PACKETOUT;
        if (ogg_stream_packetout(&stream, &packet) != 1)
                goto out;

-       PARA_DEBUG_LOG("packet #0: %lu bytes\n", packet.bytes);

        ret = ci->packet_callback(&packet, 0, ogg_page_serialno(&page),
                afhi, ci->private_data);
        if (ret < 0)
        ret = ci->packet_callback(&packet, 0, ogg_page_serialno(&page),
                afhi, ci->private_data);
        if (ret < 0)