From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 25 19:10:09 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D940D16A4CE for ; Sat, 25 Sep 2004 19:10:09 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C316543D54 for ; Sat, 25 Sep 2004 19:10:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i8PJA9jN072017 for ; Sat, 25 Sep 2004 19:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i8PJA9mF072016; Sat, 25 Sep 2004 19:10:09 GMT (envelope-from gnats) Resent-Date: Sat, 25 Sep 2004 19:10:09 GMT Resent-Message-Id: <200409251910.i8PJA9mF072016@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Arjan van Leeuwen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9EC416A4CE for ; Sat, 25 Sep 2004 19:06:44 +0000 (GMT) Received: from winston.piwebs.com (217-19-20-186.dsl.cambrium.nl [217.19.20.186]) by mx1.FreeBSD.org (Postfix) with SMTP id A5AAB43D45 for ; Sat, 25 Sep 2004 19:06:43 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: (qmail 10644 invoked from network); 25 Sep 2004 19:06:42 -0000 Received: from vincent.piwebs.com (192.168.0.84) by winston.piwebs.com with SMTP; 25 Sep 2004 19:06:42 -0000 Message-Id: <1096139206.0@vincent.piwebs.com> Date: Sat, 25 Sep 2004 21:06:46 +0200 From: "Arjan van Leeuwen" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.3 cc: riggs@rrr.de Subject: ports/72087: [PATCH] mplayer's faad audio decoding broken on amd64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Sep 2004 19:10:10 -0000 >Number: 72087 >Category: ports >Synopsis: [PATCH] mplayer's faad audio decoding broken on amd64 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Sep 25 19:10:09 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 5.3-BETA5 amd64 >Organization: >Environment: System: FreeBSD 5.3-BETA5 #1: Mon Sep 20 20:51:40 CEST 2004 root@vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT >Description: mplayer can't decode AAC audio on amd64 (mostly used in quicktime movies). This was fixed for audio/faad in ports/67060. This is the same patch, adapted to mplayer's internal version of faad. >How-To-Repeat: 1) install mplayer on amd64 2) try to decode AAC audio >Fix: --- patch-libfaad2-structs.h begins here --- --- libfaad2/structs.h.orig Sat Sep 25 19:19:19 2004 +++ libfaad2/structs.h Sat Sep 25 19:22:32 2004 @@ -309,58 +309,58 @@ typedef struct mp4AudioSpecificConfig { /* Audio Specific Info */ - uint8_t objectTypeIndex; - uint8_t samplingFrequencyIndex; - uint32_t samplingFrequency; - uint8_t channelsConfiguration; + unsigned char objectTypeIndex; + unsigned char samplingFrequencyIndex; + unsigned long samplingFrequency; + unsigned char channelsConfiguration; /* GA Specific Info */ - uint8_t frameLengthFlag; - uint8_t dependsOnCoreCoder; - uint16_t coreCoderDelay; - uint8_t extensionFlag; - uint8_t aacSectionDataResilienceFlag; - uint8_t aacScalefactorDataResilienceFlag; - uint8_t aacSpectralDataResilienceFlag; - uint8_t epConfig; + unsigned char frameLengthFlag; + unsigned char dependsOnCoreCoder; + unsigned short coreCoderDelay; + unsigned char extensionFlag; + unsigned char aacSectionDataResilienceFlag; + unsigned char aacScalefactorDataResilienceFlag; + unsigned char aacSpectralDataResilienceFlag; + unsigned char epConfig; - int8_t sbr_present_flag; - int8_t forceUpSampling; + char sbr_present_flag; + char forceUpSampling; } mp4AudioSpecificConfig; typedef struct faacDecConfiguration { - uint8_t defObjectType; - uint32_t defSampleRate; - uint8_t outputFormat; - uint8_t downMatrix; - uint8_t useOldADTSFormat; - uint8_t dontUpSampleImplicitSBR; + unsigned char defObjectType; + unsigned long defSampleRate; + unsigned char outputFormat; + unsigned char downMatrix; + unsigned char useOldADTSFormat; + unsigned char dontUpSampleImplicitSBR; } faacDecConfiguration, *faacDecConfigurationPtr; typedef struct faacDecFrameInfo { - uint32_t bytesconsumed; - uint32_t samples; - uint8_t channels; - uint8_t error; - uint32_t samplerate; + unsigned long bytesconsumed; + unsigned long samples; + unsigned char channels; + unsigned char error; + unsigned long samplerate; /* SBR: 0: off, 1: on; normal, 2: on; downsampled */ - uint8_t sbr; + unsigned char sbr; /* MPEG-4 ObjectType */ - uint8_t object_type; + unsigned char object_type; /* AAC header type; MP4 will be signalled as RAW also */ - uint8_t header_type; + unsigned char header_type; /* multichannel configuration */ - uint8_t num_front_channels; - uint8_t num_side_channels; - uint8_t num_back_channels; - uint8_t num_lfe_channels; - uint8_t channel_position[MAX_CHANNELS]; + unsigned char num_front_channels; + unsigned char num_side_channels; + unsigned char num_back_channels; + unsigned char num_lfe_channels; + unsigned char channel_position[MAX_CHANNELS]; } faacDecFrameInfo; typedef struct --- patch-libfaad2-structs.h ends here --- >Release-Note: >Audit-Trail: >Unformatted: