dvb-apps lassen sich nicht bauen

3PO · 9. Juni 2014

Hallo Zusammen,

ich wollte mir gerade mal die dvb-apps aus dem git bauen, leider aber bricht der Compiler mit folgendem fehlre ab:

Code

vdr01_64 dvb-apps # make
make -C lib all
make[1]: Entering directory `/tmp/dvb-apps/lib'
make -C libdvbapi all
make[2]: Entering directory `/tmp/dvb-apps/lib/libdvbapi'
CC dvbaudio.o
CC dvbca.o
CC dvbdemux.o
CC dvbfe.o
CC dvbnet.o
CC dvbvideo.o
In file included from dvbvideo.c:29:0:
/usr/include/linux/dvb/video.h:157:14: Fehler: expected »:«, »,«, »;«, »}« or »__attribute__« before »*« token
/usr/include/linux/dvb/video.h:190:14: Fehler: expected »:«, »,«, »;«, »}« or »__attribute__« before »*« token
make[2]: *** [dvbvideo.o] Fehler 1
make[2]: Leaving directory `/tmp/dvb-apps/lib/libdvbapi'
make[1]: *** [all] Fehler 2
make[1]: Leaving directory `/tmp/dvb-apps/lib'
make: *** [all] Fehler 2
vdr01_64 dvb-apps #

Alles anzeigen

Hat Jemand eine Idee, wie man das fixen kann?

Copperhead · 20. Juli 2014

Schon gelöst?

Ich habe gerade mal bei Arch Linux nachgeschaut. Dort wird HG Revision d40083fff895 kompiliert.

3PO · 20. Juli 2014

Zitat von Copperhead

Schon gelöst? ...

Sage wir mal jain.

Auf meinem kleinen NUC mit Gentoo und originalen Kerneltreibern geht das Bauen anstandslos:

Spoiler anzeigen

Code

satip ~ # cd /tmp
satip tmp # hg clone http://linuxtv.org/hg/dvb-apps
Zielverzeichnis: dvb-apps
Fordere alle Änderungen an
Füge Änderungssätze hinzu
Füge Manifeste hinzu
Füge Dateiänderungen hinzu
Fügte 1506 Änderungssätze mit 6093 Änderungen an 2111 Dateien hinzu
Aktualisiere auf Zweig default
547 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
satip tmp # cd dvb-apps
satip dvb-apps # make
make -C lib all
make[1]: Entering directory `/tmp/dvb-apps/lib'
make -C libdvbapi all
make[2]: Entering directory `/tmp/dvb-apps/lib/libdvbapi'
CC dvbaudio.o
CC dvbca.o
CC dvbdemux.o
CC dvbfe.o
CC dvbnet.o
CC dvbvideo.o
CC libdvbapi.so
AR libdvbapi.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libdvbapi'
make -C libdvbcfg all
make[2]: Entering directory `/tmp/dvb-apps/lib/libdvbcfg'
CC dvbcfg_zapchannel.o
CC dvbcfg_scanfile.o
CC dvbcfg_common.o
CC libdvbcfg.so
AR libdvbcfg.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libdvbcfg'
make -C libdvben50221 all
make[2]: Entering directory `/tmp/dvb-apps/lib/libdvben50221'
CC asn_1.o
CC en50221_app_ai.o
CC en50221_app_auth.o
CC en50221_app_ca.o
CC en50221_app_datetime.o
CC en50221_app_dvb.o
CC en50221_app_epg.o
CC en50221_app_lowspeed.o
CC en50221_app_mmi.o
CC en50221_app_rm.o
CC en50221_app_smartcard.o
CC en50221_app_teletext.o
CC en50221_app_utils.o
CC en50221_session.o
CC en50221_stdcam.o
CC en50221_stdcam_hlci.o
CC en50221_stdcam_llci.o
CC en50221_transport.o
CC libdvben50221.so
AR libdvben50221.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libdvben50221'
make -C libdvbsec all
make[2]: Entering directory `/tmp/dvb-apps/lib/libdvbsec'
CC dvbsec_api.o
CC dvbsec_cfg.o
CC libdvbsec.so
AR libdvbsec.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libdvbsec'
make -C libesg all
make[2]: Entering directory `/tmp/dvb-apps/lib/libesg'
CC types.o
CC bootstrap/access_descriptor.o
CC bootstrap/provider_discovery_descriptor.o
CC encapsulation/container.o
CC encapsulation/fragment_management_information.o
CC encapsulation/data_repository.o
CC encapsulation/string_repository.o
CC representation/encapsulated_textual_esg_xml_fragment.o
CC representation/init_message.o
CC representation/textual_decoder_init.o
CC transport/session_partition_declaration.o
CC libesg.so
AR libesg.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libesg'
make -C libucsi all
make[2]: Entering directory `/tmp/dvb-apps/lib/libucsi'
CC crc32.o
CC section_buf.o
CC transport_packet.o
CC atsc/atsc_text.o
CC atsc/cvct_section.o
CC atsc/dccsct_section.o
CC atsc/dcct_section.o
CC atsc/eit_section.o
CC atsc/ett_section.o
CC atsc/mgt_section.o
CC atsc/rrt_section.o
CC atsc/stt_section.o
CC atsc/tvct_section.o
CC atsc/types.o
CC dvb/bat_section.o
CC dvb/dit_section.o
CC dvb/eit_section.o
CC dvb/int_section.o
CC dvb/nit_section.o
CC dvb/rst_section.o
CC dvb/sdt_section.o
CC dvb/sit_section.o
CC dvb/st_section.o
CC dvb/tdt_section.o
CC dvb/tot_section.o
CC dvb/tva_container_section.o
CC dvb/types.o
CC mpeg/cat_section.o
CC mpeg/metadata_section.o
CC mpeg/odsmt_section.o
CC mpeg/pat_section.o
CC mpeg/pmt_section.o
CC mpeg/tsdt_section.o
CC libucsi.so
AR libucsi.a
make[2]: Leaving directory `/tmp/dvb-apps/lib/libucsi'
make[1]: Leaving directory `/tmp/dvb-apps/lib'
make -C test all
make[1]: Entering directory `/tmp/dvb-apps/test'
CC hex_dump.o
CC lnb.o
CC diseqc
CC sendburst
CC set22k
CC setpid
CC setvoltage
CC test_av
CC test_av_play
CC test_dvr
CC test_tapdmx
CC test_dvr_play
CC test_pes
CC test_sec_ne
CC test_sections
CC test_stc
CC test_stillimage
CC test_tt
CC test_vevent
CC test_video
CC evtest
CC szap2
CC lock_s
make -C libdvbcfg all
make[2]: Entering directory `/tmp/dvb-apps/test/libdvbcfg'
CC dvbcfg_test
make[2]: Leaving directory `/tmp/dvb-apps/test/libdvbcfg'
make -C libdvben50221 all
make[2]: Entering directory `/tmp/dvb-apps/test/libdvben50221'
CC test-app
CC test-session
CC test-transport
make[2]: Leaving directory `/tmp/dvb-apps/test/libdvben50221'
make -C libesg all
make[2]: Entering directory `/tmp/dvb-apps/test/libesg'
CC testesg
make[2]: Leaving directory `/tmp/dvb-apps/test/libesg'
make -C libucsi all
make[2]: Entering directory `/tmp/dvb-apps/test/libucsi'
CC testucsi
make[2]: Leaving directory `/tmp/dvb-apps/test/libucsi'
make[1]: Leaving directory `/tmp/dvb-apps/test'
make -C util all
make[1]: Entering directory `/tmp/dvb-apps/util'
make -C atsc_epg all
make[2]: Entering directory `/tmp/dvb-apps/util/atsc_epg'
CC atsc_epg
make[2]: Leaving directory `/tmp/dvb-apps/util/atsc_epg'
make -C av7110_loadkeys all
make[2]: Entering directory `/tmp/dvb-apps/util/av7110_loadkeys'
/bin/sh generate-keynames.sh input_keynames.h
generate input_keynames.h...
CC av7110_loadkeys
make[2]: Leaving directory `/tmp/dvb-apps/util/av7110_loadkeys'
make -C dib3000-watch all
make[2]: Entering directory `/tmp/dvb-apps/util/dib3000-watch'
CC dib3000-watch
make[2]: Leaving directory `/tmp/dvb-apps/util/dib3000-watch'
make -C dst-utils all
make[2]: Entering directory `/tmp/dvb-apps/util/dst-utils'
CC dst_test
make[2]: Leaving directory `/tmp/dvb-apps/util/dst-utils'
make -C dvbdate all
make[2]: Entering directory `/tmp/dvb-apps/util/dvbdate'
CC dvbdate
make[2]: Leaving directory `/tmp/dvb-apps/util/dvbdate'
make -C dvbnet all
make[2]: Entering directory `/tmp/dvb-apps/util/dvbnet'
CC dvbnet
make[2]: Leaving directory `/tmp/dvb-apps/util/dvbnet'
make -C dvbtraffic all
make[2]: Entering directory `/tmp/dvb-apps/util/dvbtraffic'
CC dvbtraffic
make[2]: Leaving directory `/tmp/dvb-apps/util/dvbtraffic'
make -C dvbscan all
make[2]: Entering directory `/tmp/dvb-apps/util/dvbscan'
CC dvbscan.o
CC dvbscan_structutils.o
CC dvbscan_dvb.o
CC dvbscan_atsc.o
CC dvbscan
make[2]: Leaving directory `/tmp/dvb-apps/util/dvbscan'
make -C femon all
make[2]: Entering directory `/tmp/dvb-apps/util/femon'
CC femon
make[2]: Leaving directory `/tmp/dvb-apps/util/femon'
make -C scan all
make[2]: Entering directory `/tmp/dvb-apps/util/scan'
perl section_generate.pl atsc_psip_section.pl
CC scan.o
CC atsc_psip_section.o
CC diseqc.o
CC dump-vdr.o
CC dump-zap.o
CC lnb.o
CC section.o
CC scan
make[2]: Leaving directory `/tmp/dvb-apps/util/scan'
make -C szap all
DVB API is 5.10
make[2]: Entering directory `/tmp/dvb-apps/util/szap'
CC lnb.o
CC util.o
CC azap
CC czap
CC szap
CC tzap
make[2]: Leaving directory `/tmp/dvb-apps/util/szap'
make -C ttusb_dec_reset all
make[2]: Entering directory `/tmp/dvb-apps/util/ttusb_dec_reset'
cleaning
make[2]: Leaving directory `/tmp/dvb-apps/util/ttusb_dec_reset'
make -C gnutv all
make[2]: Entering directory `/tmp/dvb-apps/util/gnutv'
CC gnutv_ca.o
CC gnutv_dvb.o
CC gnutv_data.o
CC gnutv
make[2]: Leaving directory `/tmp/dvb-apps/util/gnutv'
make -C gotox all
make[2]: Entering directory `/tmp/dvb-apps/util/gotox'
CC gotox
make[2]: Leaving directory `/tmp/dvb-apps/util/gotox'
make -C zap all
make[2]: Entering directory `/tmp/dvb-apps/util/zap'
CC zap_ca.o
CC zap_dvb.o
CC zap
make[2]: Leaving directory `/tmp/dvb-apps/util/zap'
make -C lsdvb all
make[2]: Entering directory `/tmp/dvb-apps/util/lsdvb'
CC lsdvb
make[2]: Leaving directory `/tmp/dvb-apps/util/lsdvb'
make[1]: Leaving directory `/tmp/dvb-apps/util'
satip dvb-apps #

Alles anzeigen

Auf meinem VDR (auch Gentoo) mit dem media_build von UFO geht's nicht:

Spoiler anzeigen

Kernelversion ist auf beiden 3.15.5.

Ist aber nicht weiter tragisch, da ich mittlerweile ein Lösung gefunden habe, die ohne die dvb-apps geht.

wirbel · 20. Juli 2014

Zitat

Code

/usr/include/linux/dvb/video.h:157:14: Fehler: expected »:«, »,«, »;«, »}« or »__attribute__« before »*« token
/usr/include/linux/dvb/video.h:190:14: Fehler: expected »:«, »,«, »;«, »}« or »__attribute__« before »*« token

Hat Jemand eine Idee, wie man das fixen kann?

Indem man auf deinem System mal /usr/include/linux/dvb/video.h, Zeile 157 anschaut, genauer ab dem 14.ten Zeichen?

3PO · 20. Juli 2014

Ohne Kenntnisse in "C" wird es wohl nichts bringen, wenn ICH mir das ansehe.

Code

vdr01_64 ~ # sed -n '157p' /usr/include/linux/dvb/video.h
        char __user *iFrame;        /* pointer to a single iframe in memory */
vdr01_64 ~ #

und hier noch die ganze "/usr/include/linux/dvb/video.h"

Spoiler anzeigen

C

/*
 * video.h
 *
 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
 *                  & Ralph  Metzler <ralph@convergence.de>
 *                    for convergence integrated media GmbH
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation; either version 2.1
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */


#ifndef _UAPI_DVBVIDEO_H_
#define _UAPI_DVBVIDEO_H_


#include <linux/types.h>
#ifndef __KERNEL__
#include <stdint.h>
#include <time.h>
#endif


typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
        VIDEO_FORMAT_221_1    /* 2.21:1 */
} video_format_t;




typedef enum {
         VIDEO_SYSTEM_PAL,
         VIDEO_SYSTEM_NTSC,
         VIDEO_SYSTEM_PALN,
         VIDEO_SYSTEM_PALNc,
         VIDEO_SYSTEM_PALM,
         VIDEO_SYSTEM_NTSC60,
         VIDEO_SYSTEM_PAL60,
         VIDEO_SYSTEM_PALM60
} video_system_t;




typedef enum {
        VIDEO_PAN_SCAN,       /* use pan and scan format */
        VIDEO_LETTER_BOX,     /* use letterbox format */
        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
} video_displayformat_t;


typedef struct {
        int w;
        int h;
        video_format_t aspect_ratio;
} video_size_t;


typedef enum {
        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
                               comes from the user through the write
                               system call */
} video_stream_source_t;




typedef enum {
        VIDEO_STOPPED, /* Video is stopped */
        VIDEO_PLAYING, /* Video is currently playing */
        VIDEO_FREEZED  /* Video is freezed */
} video_play_state_t;




/* Decoder commands */
#define VIDEO_CMD_PLAY        (0)
#define VIDEO_CMD_STOP        (1)
#define VIDEO_CMD_FREEZE      (2)
#define VIDEO_CMD_CONTINUE    (3)


/* Flags for VIDEO_CMD_FREEZE */
#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)


/* Flags for VIDEO_CMD_STOP */
#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)


/* Play input formats: */
/* The decoder has no special format requirements */
#define VIDEO_PLAY_FMT_NONE         (0)
/* The decoder requires full GOPs */
#define VIDEO_PLAY_FMT_GOP          (1)


/* The structure must be zeroed before use by the application
   This ensures it can be extended safely in the future. */
struct video_command {
        __u32 cmd;
        __u32 flags;
        union {
                struct {
                        __u64 pts;
                } stop;


                struct {
                        /* 0 or 1000 specifies normal speed,
                           1 specifies forward single stepping,
                           -1 specifies backward single stepping,
                           >1: playback at speed/1000 of the normal speed,
                           <-1: reverse playback at (-speed/1000) of the normal speed. */
                        __s32 speed;
                        __u32 format;
                } play;


                struct {
                        __u32 data[16];
                } raw;
        };
};


/* FIELD_UNKNOWN can be used if the hardware does not know whether
   the Vsync is for an odd, even or progressive (i.e. non-interlaced)
   field. */
#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
#define VIDEO_VSYNC_FIELD_ODD           (1)
#define VIDEO_VSYNC_FIELD_EVEN          (2)
#define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)


struct video_event {
        __s32 type;
#define VIDEO_EVENT_SIZE_CHANGED        1
#define VIDEO_EVENT_FRAME_RATE_CHANGED  2
#define VIDEO_EVENT_DECODER_STOPPED     3
#define VIDEO_EVENT_VSYNC               4
        __kernel_time_t timestamp;
        union {
                video_size_t size;
                unsigned int frame_rate;        /* in frames per 1000sec */
                unsigned char vsync_field;      /* unknown/odd/even/progressive */
        } u;
};




struct video_status {
        int                   video_blank;   /* blank video on freeze? */
        video_play_state_t    play_state;    /* current state of playback */
        video_stream_source_t stream_source; /* current source (demux/memory) */
        video_format_t        video_format;  /* current aspect ratio of stream*/
        video_displayformat_t display_format;/* selected cropping mode */
};




struct video_still_picture {
        char __user *iFrame;        /* pointer to a single iframe in memory */
        __s32 size;
};




typedef
struct video_highlight {
        int     active;      /*    1=show highlight, 0=hide highlight */
        __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
                             /*    3- 0  Background pixel contrast */
        __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
                             /*    3- 0  Emphasis pixel-1 contrast */
        __u8    color1;      /*    7- 4  Pattern pixel color */
                             /*    3- 0  Background pixel color */
        __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
                             /*    3- 0  Emphasis pixel-1 color */
        __u32    ypos;       /*   23-22  auto action mode */
                             /*   21-12  start y */
                             /*    9- 0  end y */
        __u32    xpos;       /*   23-22  button color number */
                             /*   21-12  start x */
                             /*    9- 0  end x */
} video_highlight_t;




typedef struct video_spu {
        int active;
        int stream_id;
} video_spu_t;




typedef struct video_spu_palette {      /* SPU Palette information */
        int length;
        __u8 __user *palette;
} video_spu_palette_t;




typedef struct video_navi_pack {
        int length;          /* 0 ... 1024 */
        __u8 data[1024];
} video_navi_pack_t;




typedef __u16 video_attributes_t;
/*   bits: descr. */
/*   15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
/*   13-12 TV system (0=525/60, 1=625/50) */
/*   11-10 Aspect ratio (0=4:3, 3=16:9) */
/*    9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca */
/*    7    line 21-1 data present in GOP (1=yes, 0=no) */
/*    6    line 21-2 data present in GOP (1=yes, 0=no) */
/*    5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 */
/*    2    source letterboxed (1=yes, 0=no) */
/*    0    film/camera mode (0=camera, 1=film (625/50 only)) */




/* bit definitions for capabilities: */
/* can the hardware decode MPEG1 and/or MPEG2? */
#define VIDEO_CAP_MPEG1   1
#define VIDEO_CAP_MPEG2   2
/* can you send a system and/or program stream to video device?
   (you still have to open the video and the audio device but only
    send the stream to the video device) */
#define VIDEO_CAP_SYS     4
#define VIDEO_CAP_PROG    8
/* can the driver also handle SPU, NAVI and CSS encoded data?
   (CSS API is not present yet) */
#define VIDEO_CAP_SPU    16
#define VIDEO_CAP_NAVI   32
#define VIDEO_CAP_CSS    64




#define VIDEO_STOP                 _IO('o', 21)
#define VIDEO_PLAY                 _IO('o', 22)
#define VIDEO_FREEZE               _IO('o', 23)
#define VIDEO_CONTINUE             _IO('o', 24)
#define VIDEO_SELECT_SOURCE        _IO('o', 25)
#define VIDEO_SET_BLANK            _IO('o', 26)
#define VIDEO_GET_STATUS           _IOR('o', 27, struct video_status)
#define VIDEO_GET_EVENT            _IOR('o', 28, struct video_event)
#define VIDEO_SET_DISPLAY_FORMAT   _IO('o', 29)
#define VIDEO_STILLPICTURE         _IOW('o', 30, struct video_still_picture)
#define VIDEO_FAST_FORWARD         _IO('o', 31)
#define VIDEO_SLOWMOTION           _IO('o', 32)
#define VIDEO_GET_CAPABILITIES     _IOR('o', 33, unsigned int)
#define VIDEO_CLEAR_BUFFER         _IO('o',  34)
#define VIDEO_SET_ID               _IO('o', 35)
#define VIDEO_SET_STREAMTYPE       _IO('o', 36)
#define VIDEO_SET_FORMAT           _IO('o', 37)
#define VIDEO_SET_SYSTEM           _IO('o', 38)
#define VIDEO_SET_HIGHLIGHT        _IOW('o', 39, video_highlight_t)
#define VIDEO_SET_SPU              _IOW('o', 50, video_spu_t)
#define VIDEO_SET_SPU_PALETTE      _IOW('o', 51, video_spu_palette_t)
#define VIDEO_GET_NAVI             _IOR('o', 52, video_navi_pack_t)
#define VIDEO_SET_ATTRIBUTES       _IO('o', 53)
#define VIDEO_GET_SIZE             _IOR('o', 55, video_size_t)
#define VIDEO_GET_FRAME_RATE       _IOR('o', 56, unsigned int)


/**
 * VIDEO_GET_PTS
 *
 * Read the 33 bit presentation time stamp as defined
 * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
 *
 * The PTS should belong to the currently played
 * frame if possible, but may also be a value close to it
 * like the PTS of the last decoded frame or the last PTS
 * extracted by the PES parser.
 */
#define VIDEO_GET_PTS              _IOR('o', 57, __u64)


/* Read the number of displayed frames since the decoder was started */
#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)


#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)


#endif /* _UAPI_DVBVIDEO_H_ */

Alles anzeigen

Und her noch ein "diff" der beiden video.h der beiden Systeme:

Spoiler anzeigen

Diff

--- /usr/include/linux/dvb/video.h      2014-05-14 14:08:36.000000000 +0200
+++ /tmp/video.h        2014-07-20 15:24:52.000000000 +0200
@@ -21,58 +21,56 @@
  *
  */


-#ifndef _UAPI_DVBVIDEO_H_
-#define _UAPI_DVBVIDEO_H_
+#ifndef _DVBVIDEO_H_
+#define _DVBVIDEO_H_


 #include <linux/types.h>
-#ifndef __KERNEL__
 #include <stdint.h>
 #include <time.h>
-#endif


 typedef enum {
-       VIDEO_FORMAT_4_3,     /* Select 4:3 format */
-       VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
-       VIDEO_FORMAT_221_1    /* 2.21:1 */
+        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
+        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
+        VIDEO_FORMAT_221_1    /* 2.21:1 */
 } video_format_t;




 typedef enum {
-        VIDEO_SYSTEM_PAL,
-        VIDEO_SYSTEM_NTSC,
-        VIDEO_SYSTEM_PALN,
-        VIDEO_SYSTEM_PALNc,
-        VIDEO_SYSTEM_PALM,
-        VIDEO_SYSTEM_NTSC60,
-        VIDEO_SYSTEM_PAL60,
-        VIDEO_SYSTEM_PALM60
+         VIDEO_SYSTEM_PAL,
+         VIDEO_SYSTEM_NTSC,
+         VIDEO_SYSTEM_PALN,
+         VIDEO_SYSTEM_PALNc,
+         VIDEO_SYSTEM_PALM,
+         VIDEO_SYSTEM_NTSC60,
+         VIDEO_SYSTEM_PAL60,
+         VIDEO_SYSTEM_PALM60
 } video_system_t;




 typedef enum {
-       VIDEO_PAN_SCAN,       /* use pan and scan format */
-       VIDEO_LETTER_BOX,     /* use letterbox format */
-       VIDEO_CENTER_CUT_OUT  /* use center cut out format */
+        VIDEO_PAN_SCAN,       /* use pan and scan format */
+        VIDEO_LETTER_BOX,     /* use letterbox format */
+        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
 } video_displayformat_t;


 typedef struct {
-       int w;
-       int h;
-       video_format_t aspect_ratio;
+        int w;
+        int h;
+        video_format_t aspect_ratio;
 } video_size_t;


 typedef enum {
-       VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
-       VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
-                              comes from the user through the write
-                              system call */
+        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
+        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
+                               comes from the user through the write
+                               system call */
 } video_stream_source_t;




 typedef enum {
-       VIDEO_STOPPED, /* Video is stopped */
-       VIDEO_PLAYING, /* Video is currently playing */
-       VIDEO_FREEZED  /* Video is freezed */
+        VIDEO_STOPPED, /* Video is stopped */
+        VIDEO_PLAYING, /* Video is currently playing */
+        VIDEO_FREEZED  /* Video is freezed */
 } video_play_state_t;




@@ -83,11 +81,11 @@
 #define VIDEO_CMD_CONTINUE    (3)


 /* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK      (1 << 0)
+#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)


 /* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK        (1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY             (1 << 1)
+#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
+#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)


 /* Play input formats: */
 /* The decoder has no special format requirements */
@@ -98,102 +96,102 @@
 /* The structure must be zeroed before use by the application
    This ensures it can be extended safely in the future. */
 struct video_command {
-       __u32 cmd;
-       __u32 flags;
-       union {
-               struct {
-                       __u64 pts;
-               } stop;
-
-               struct {
-                       /* 0 or 1000 specifies normal speed,
-                          1 specifies forward single stepping,
-                          -1 specifies backward single stepping,
-                          >1: playback at speed/1000 of the normal speed,
-                          <-1: reverse playback at (-speed/1000) of the normal speed. */
-                       __s32 speed;
-                       __u32 format;
-               } play;
-
-               struct {
-                       __u32 data[16];
-               } raw;
-       };
+        __u32 cmd;
+        __u32 flags;
+        union {
+                struct {
+                        __u64 pts;
+                } stop;
+
+                struct {
+                        /* 0 or 1000 specifies normal speed,
+                           1 specifies forward single stepping,
+                           -1 specifies backward single stepping,
+                           >1: playback at speed/1000 of the normal speed,
+                           <-1: reverse playback at (-speed/1000) of the normal speed. */
+                        __s32 speed;
+                        __u32 format;
+                } play;
+
+                struct {
+                        __u32 data[16];
+                } raw;
+        };
 };


 /* FIELD_UNKNOWN can be used if the hardware does not know whether
    the Vsync is for an odd, even or progressive (i.e. non-interlaced)
    field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN      (0)
-#define VIDEO_VSYNC_FIELD_ODD          (1)
-#define VIDEO_VSYNC_FIELD_EVEN         (2)
-#define VIDEO_VSYNC_FIELD_PROGRESSIVE  (3)
+#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
+#define VIDEO_VSYNC_FIELD_ODD           (1)
+#define VIDEO_VSYNC_FIELD_EVEN          (2)
+#define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)


 struct video_event {
-       __s32 type;
-#define VIDEO_EVENT_SIZE_CHANGED       1
-#define VIDEO_EVENT_FRAME_RATE_CHANGED 2
-#define VIDEO_EVENT_DECODER_STOPPED    3
-#define VIDEO_EVENT_VSYNC              4
-       __kernel_time_t timestamp;
-       union {
-               video_size_t size;
-               unsigned int frame_rate;        /* in frames per 1000sec */
-               unsigned char vsync_field;      /* unknown/odd/even/progressive */
-       } u;
+        __s32 type;
+#define VIDEO_EVENT_SIZE_CHANGED        1
+#define VIDEO_EVENT_FRAME_RATE_CHANGED  2
+#define VIDEO_EVENT_DECODER_STOPPED     3
+#define VIDEO_EVENT_VSYNC               4
+        __kernel_time_t timestamp;
+        union {
+                video_size_t size;
+                unsigned int frame_rate;        /* in frames per 1000sec */
+                unsigned char vsync_field;      /* unknown/odd/even/progressive */
+        } u;
 };




 struct video_status {
-       int                   video_blank;   /* blank video on freeze? */
-       video_play_state_t    play_state;    /* current state of playback */
-       video_stream_source_t stream_source; /* current source (demux/memory) */
-       video_format_t        video_format;  /* current aspect ratio of stream*/
-       video_displayformat_t display_format;/* selected cropping mode */
+        int                   video_blank;   /* blank video on freeze? */
+        video_play_state_t    play_state;    /* current state of playback */
+        video_stream_source_t stream_source; /* current source (demux/memory) */
+        video_format_t        video_format;  /* current aspect ratio of stream*/
+        video_displayformat_t display_format;/* selected cropping mode */
 };




 struct video_still_picture {
-       char __user *iFrame;        /* pointer to a single iframe in memory */
-       __s32 size;
+        char *iFrame;        /* pointer to a single iframe in memory */
+        __s32 size;
 };




 typedef
 struct video_highlight {
-       int     active;      /*    1=show highlight, 0=hide highlight */
-       __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
-                            /*    3- 0  Background pixel contrast */
-       __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
-                            /*    3- 0  Emphasis pixel-1 contrast */
-       __u8    color1;      /*    7- 4  Pattern pixel color */
-                            /*    3- 0  Background pixel color */
-       __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
-                            /*    3- 0  Emphasis pixel-1 color */
-       __u32    ypos;       /*   23-22  auto action mode */
-                            /*   21-12  start y */
-                            /*    9- 0  end y */
-       __u32    xpos;       /*   23-22  button color number */
-                            /*   21-12  start x */
-                            /*    9- 0  end x */
+        int     active;      /*    1=show highlight, 0=hide highlight */
+        __u8    contrast1;   /*    7- 4  Pattern pixel contrast */
+                             /*    3- 0  Background pixel contrast */
+        __u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
+                             /*    3- 0  Emphasis pixel-1 contrast */
+        __u8    color1;      /*    7- 4  Pattern pixel color */
+                             /*    3- 0  Background pixel color */
+        __u8    color2;      /*    7- 4  Emphasis pixel-2 color */
+                             /*    3- 0  Emphasis pixel-1 color */
+        __u32    ypos;       /*   23-22  auto action mode */
+                             /*   21-12  start y */
+                             /*    9- 0  end y */
+        __u32    xpos;       /*   23-22  button color number */
+                             /*   21-12  start x */
+                             /*    9- 0  end x */
 } video_highlight_t;




 typedef struct video_spu {
-       int active;
-       int stream_id;
+        int active;
+        int stream_id;
 } video_spu_t;




 typedef struct video_spu_palette {      /* SPU Palette information */
-       int length;
-       __u8 __user *palette;
+        int length;
+        __u8 *palette;
 } video_spu_palette_t;




 typedef struct video_navi_pack {
-       int length;          /* 0 ... 1024 */
-       __u8 data[1024];
+        int length;          /* 0 ... 1024 */
+        __u8 data[1024];
 } video_navi_pack_t;




@@ -266,9 +264,9 @@
 #define VIDEO_GET_PTS              _IOR('o', 57, __u64)


 /* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT             _IOR('o', 58, __u64)
+#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)


-#define VIDEO_COMMAND             _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND         _IOWR('o', 60, struct video_command)
+#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
+#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)


-#endif /* _UAPI_DVBVIDEO_H_ */
+#endif /* _DVBVIDEO_H_ */

Alles anzeigen

wirbel · 20. Juli 2014

Dein compiler stolpert über das unbekannte '__user'.

Entweder ist das als Macro irgendwo in zusätzlichen headern definiert oder wird den Compiler Optionen mitgegeben, dann wäre es eine Makefile Frage.

3PO · 20. Juli 2014

Wenn ich das richtig verstehe, gibt es in der Originalen video.h, "__user " gar nicht?

Diff

vdr01_64 ~ # diff -u --ignore-space-change /usr/include/linux/dvb/video.h  /tmp/video.h
--- /usr/include/linux/dvb/video.h      2014-05-14 14:08:36.000000000 +0200
+++ /tmp/video.h        2014-07-20 15:24:52.000000000 +0200
@@ -21,14 +21,12 @@
  *
  */


-#ifndef _UAPI_DVBVIDEO_H_
-#define _UAPI_DVBVIDEO_H_
+#ifndef _DVBVIDEO_H_
+#define _DVBVIDEO_H_


 #include <linux/types.h>
-#ifndef __KERNEL__
 #include <stdint.h>
 #include <time.h>
-#endif


 typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
@@ -154,7 +152,7 @@




 struct video_still_picture {
-       char __user *iFrame;        /* pointer to a single iframe in memory */
+        char *iFrame;        /* pointer to a single iframe in memory */
        __s32 size;
 };


@@ -187,7 +185,7 @@


 typedef struct video_spu_palette {      /* SPU Palette information */
        int length;
-       __u8 __user *palette;
+        __u8 *palette;
 } video_spu_palette_t;




@@ -271,4 +269,4 @@
 #define VIDEO_COMMAND             _IOWR('o', 59, struct video_command)
 #define VIDEO_TRY_COMMAND         _IOWR('o', 60, struct video_command)


-#endif /* _UAPI_DVBVIDEO_H_ */
+#endif /* _DVBVIDEO_H_ */
vdr01_64 ~ #

Alles anzeigen

Copperhead · 20. Juli 2014

Ich lasse ja aus solchen Gründen schon länge die Finger von media_build_experimental.

3PO · 20. Juli 2014

Das Problem ist halt, wenn man DVB Devices vom DD, bzw. L4M hat, wird man wohl um den media_build_experimental nicht herumkommen, da die Treiber, die im Kernel integriert sind, nicht viel taugen. Bei mir z.B. müllt der im Kernel enthaltene Treiber, das Kernellog zu.

Copperhead · 20. Juli 2014

Hatte ich noch keine Probleme. Für Support bis zu den Cine S2 V6.5 hoch ist nur ein winzig kleiner Patch nötig. Läuft ziemlich problemlos.
Diesen Patch versuchen wir auch gerade in den Kernel zu bekommen.

3PO · 20. Juli 2014

Nun, zum Einen weiß ich nicht, wer "wir" ist, zum Anderen macht es doch keinen Unterschied, ob ich nun die Kernelsourcen patchen muss, oder gleich den media_build_experimental verwende....

Copperhead · 20. Juli 2014

Klar macht es einen Unterschied.

Kernel patchen ist im Normalfall minimalinvasiv.
media_build_experimental nicht.

Dein Problem kommt nur daher, weil media_build_experimental irgendwie überall drin hängt.

3PO · 20. Juli 2014

Zitat von Copperhead

[...] Kernel patchen ist im Normalfall minimalinvasiv. ...

Nun, aber auch minimalinvasive Kernelpatche wirken sich systemweit aus...

Copperhead · 20. Juli 2014

Das kommt immer darauf an, welche Dateien genau gepatcht werden.

3PO · 20. Juli 2014

Selbiges gilt aber auch für externe Treiber.

Aber im Grunde genommen ist es auch egal, da ich die dvb-apps nicht benötige, - zumindest mal nicht auf meinem VDR.

Copperhead · 20. Juli 2014

Warum diskutiere ich eigentlich noch. Du gibst mir ja schon aus Prinzip nicht recht.

wirbel · 20. Juli 2014

Um auf das Problem zurück zu kommen..

Google: "__user filetype:h"

wahrscheinlich genügt auf eurem System ein include mit compiler.h vor den Stellen, an denen <linux/dvb/video.h> aufgerufen wird. Und es bleibt die Frage, warum die Datei auf eurem System nicht automatisch eingebunden wird.

3PO · 20. Juli 2014

Zitat von wirbel

Um auf das Problem zurück zu kommen..

Google: "__user filetype:h" ...

Wenn man weiß, wonach man suchen muss, ist Google sicherlich recht hilfreich.

Zitat von wirbel

[...] wahrscheinlich genügt auf eurem System ein include mit compiler.h vor den Stellen, an denen <linux/dvb/video.h> aufgerufen wird. ...

Wie oben schon gesagt, ich spreche leider kein "C".

Zitat von wirbel

[...] Und es bleibt die Frage, warum die Datei auf eurem System nicht automatisch eingebunden wird.

Nun, ich installiere den media_build_experimental via bash Script. Es gab da mal , in dem Megathread von media_build_experimental, eine Diskussion, dass man, wenn man media_build_experimental verwendet, auch die entsprechenden Header installieren sollte, also habe ich mir folgendes in mein Script eingebaut:

Code

[...]
cd media_build_experimental
[...]
cp -va linux/include/uapi/linux/* /usr/include/linux/
[...]

Aktuelle Treiber für Octopus(ddbridge), CineS2(ngene/ddbridge), DuoFlex-S2, DuoFlex-CT, CineCT sowie TT S2-6400 (Teil 2)

Wie gesagt, bisher gab es nie Probleme damit, es nur die dvb-apps, die wohl etwas zickig sind.

dvb-apps lassen sich nicht bauen

Jetzt mitmachen!

Teilen

Tags

Benutzer online in diesem Thema