comparison mmst.c @ 6317:c166e5ff20b9 libavformat

Use inverse error branches, i.e. instead of if(something){success} else {error}, use if(!something) {return error;} success;, which needs less indenting.

6316:270f6c8aeac5

{
    int read_result;
    MMSSCPacketType packet_type= -1;

    for(;;) {
        if((read_result= url_read_complete(mms->mms_hd, mms->in_buffer, 8))==8) {
            // handle command packet.
            if(AV_RL32(mms->in_buffer + 4)==0xb00bface) {
                mms->incoming_flags= mms->in_buffer[3];
                read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
                if(read_result == 4) {
                    int length_remaining= AV_RL32(mms->in_buffer+8) + 4;
                    int hr;

                    dprintf(NULL, "Length remaining is %d\n", length_remaining);
                    // read the rest of the packet.
                    if (length_remaining < 0
                        || length_remaining > sizeof(mms->in_buffer) - 12) {
                        av_log(NULL, AV_LOG_ERROR,

                               length_remaining, sizeof(mms->in_buffer) - 12);
                        return AVERROR_INVALIDDATA;
                    }
                    read_result = url_read_complete(mms->mms_hd, mms->in_buffer + 12,
                                                  length_remaining) ;
                    if (read_result == length_remaining) {
                        packet_type= AV_RL16(mms->in_buffer+36);
                    } else {
                        av_log(NULL, AV_LOG_ERROR,
                               "Reading pkt data (length=%d) failed: %d (%s)\n",
                               length_remaining, read_result,
                               read_result < 0 ? strerror(read_result) :
                                   "The server closed the connection");
                        return read_result < 0 ? read_result : AVERROR_IO;
                    }
                    hr = AV_RL32(mms->in_buffer + 40);
                    if (hr) {
                        av_log(NULL, AV_LOG_ERROR,
                               "Server sent an error status code: 0x%08x\n",
                               hr);
                        return AVERROR_UNKNOWN;
                    }
                } else {
                    av_log(NULL, AV_LOG_ERROR,
                           "Reading command packet length failed: %d (%s)\n",
                           read_result,
                           read_result < 0 ? strerror(read_result) :
                               "The server closed the connection");
                    return read_result < 0 ? read_result : AVERROR_IO;
                }
            } else {
                int length_remaining;
                int packet_id_type;
                int tmp;

                           "Failed to read packet data of size %d: %d (%s)\n",
                           length_remaining, read_result,
                           read_result < 0 ? strerror(read_result) :
                               "The server closed the connection");
                    return read_result < 0 ? read_result : AVERROR_IO;
                } else {
                    // if we successfully read everything.
                    if(packet_id_type == mms->header_packet_id) {
                        packet_type = SC_PKT_ASF_HEADER;
                        // Store the asf header
                        if(!mms->header_parsed) {

                        packet_type = SC_PKT_ASF_MEDIA;
                    } else {
                        dprintf(NULL, "packet id type %d is old.", packet_id_type);
                        continue;
                    }
                }
            }

            // preprocess some packet type
            if(packet_type == SC_PKT_KEEPALIVE) {
                send_keepalive_packet(mms);

                handle_packet_stream_changing_type(mms);
            } else if(packet_type == SC_PKT_ASF_MEDIA) {
                pad_media_packet(mms);
            }
            return packet_type;
        } else {
            if(read_result<0) {
                av_log(NULL, AV_LOG_ERROR,
                       "Error reading packet header: %d (%s)\n",
                       read_result, strerror(read_result));
                packet_type = SC_PKT_CANCEL;
            } else {
                av_log(NULL, AV_LOG_ERROR,
                       "The server closed the connection\n");
                packet_type = SC_PKT_NO_DATA;
            }
            return packet_type;
        }
    }
}

static int mms_safe_send_recv(MMSContext *mms,
                              int (*send_fun)(MMSContext *mms),

6317:c166e5ff20b9

{
    int read_result;
    MMSSCPacketType packet_type= -1;

    for(;;) {
        read_result = url_read_complete(mms->mms_hd, mms->in_buffer, 8);
        if (read_result != 8) {
            if(read_result < 0) {
                av_log(NULL, AV_LOG_ERROR,
                       "Error reading packet header: %d (%s)\n",
                       read_result, strerror(read_result));
                packet_type = SC_PKT_CANCEL;
            } else {
                av_log(NULL, AV_LOG_ERROR,
                       "The server closed the connection\n");
                packet_type = SC_PKT_NO_DATA;
            }
            return packet_type;
        }

            // handle command packet.
            if(AV_RL32(mms->in_buffer + 4)==0xb00bface) {
            int length_remaining, hr;

                mms->incoming_flags= mms->in_buffer[3];
                read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
                if(read_result != 4) {
                    av_log(NULL, AV_LOG_ERROR,
                           "Reading command packet length failed: %d (%s)\n",
                           read_result,
                           read_result < 0 ? strerror(read_result) :
                               "The server closed the connection");
                    return read_result < 0 ? read_result : AVERROR_IO;
                }

            length_remaining= AV_RL32(mms->in_buffer+8) + 4;
                    dprintf(NULL, "Length remaining is %d\n", length_remaining);
                    // read the rest of the packet.
                    if (length_remaining < 0
                        || length_remaining > sizeof(mms->in_buffer) - 12) {
                        av_log(NULL, AV_LOG_ERROR,

                               length_remaining, sizeof(mms->in_buffer) - 12);
                        return AVERROR_INVALIDDATA;
                    }
                    read_result = url_read_complete(mms->mms_hd, mms->in_buffer + 12,
                                                  length_remaining) ;
                    if (read_result != length_remaining) {
                        av_log(NULL, AV_LOG_ERROR,
                               "Reading pkt data (length=%d) failed: %d (%s)\n",
                               length_remaining, read_result,
                               read_result < 0 ? strerror(read_result) :
                                   "The server closed the connection");
                        return read_result < 0 ? read_result : AVERROR_IO;
                    }
                    packet_type= AV_RL16(mms->in_buffer+36);
                    hr = AV_RL32(mms->in_buffer + 40);
                    if (hr) {
                        av_log(NULL, AV_LOG_ERROR,
                               "Server sent an error status code: 0x%08x\n",
                               hr);
                        return AVERROR_UNKNOWN;
                    }
            } else {
                int length_remaining;
                int packet_id_type;
                int tmp;

                           "Failed to read packet data of size %d: %d (%s)\n",
                           length_remaining, read_result,
                           read_result < 0 ? strerror(read_result) :
                               "The server closed the connection");
                    return read_result < 0 ? read_result : AVERROR_IO;
                }

                    // if we successfully read everything.
                    if(packet_id_type == mms->header_packet_id) {
                        packet_type = SC_PKT_ASF_HEADER;
                        // Store the asf header
                        if(!mms->header_parsed) {

                        packet_type = SC_PKT_ASF_MEDIA;
                    } else {
                        dprintf(NULL, "packet id type %d is old.", packet_id_type);
                        continue;
                    }
            }

            // preprocess some packet type
            if(packet_type == SC_PKT_KEEPALIVE) {
                send_keepalive_packet(mms);

                handle_packet_stream_changing_type(mms);
            } else if(packet_type == SC_PKT_ASF_MEDIA) {
                pad_media_packet(mms);
            }
            return packet_type;
    }
}

static int mms_safe_send_recv(MMSContext *mms,
                              int (*send_fun)(MMSContext *mms),