Git commit 18fd212bd07947e9dbfcd027bba701087edf5ca4 by Gilles Caulier.
Committed on 27/08/2016 at 09:08.
Pushed by cgilles into branch 'master'.

separate image and video section. DK is able to understand video but not 
Showfoto.
CCBUGS: [email protected]

M  +1    -0    TODO
M  +4    -2    digikam/index.docbook
R  +50   -62   digikam/intro-imageformats.docbook [from: 
digikam/intro-fileformats.docbook - 071% similarity]
A  +38   -0    digikam/intro-movieformats.docbook
M  +2    -2    showfoto/index.docbook

http://commits.kde.org/digikam-doc/18fd212bd07947e9dbfcd027bba701087edf5ca4

diff --git a/TODO b/TODO
index 0b42d17..afa035b 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,7 @@ intro-camerasupport.docbook                *               
DONE              Wol
 intro-database.docbook                                                        
Swati                Need to be created
 intro-fileformats.docbook                  DONE            DONE              
Wolfgang
 intro-firstrun.docbook                     DONE            DONE              
Wolfgang
+intro-movieformats.docbook                 *               DONE               
Gilles               Add more details about extra codec for non Linux and the 
ability to search metadata on DB.
 intro-pluginsupport.docbook                DONE            DONE               
Gilles
 menu-bqm.docbook                                                               
                    Need to be created
 menu-camera.docbook                                                            
                    Need to be created
diff --git a/digikam/index.docbook b/digikam/index.docbook
index e7664ca..57cb347 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -10,7 +10,8 @@
 <!-- Introduction Chapter -->
   <!ENTITY doc-intro-background       SYSTEM "intro-background.docbook">
   <!ENTITY doc-intro-firstrun         SYSTEM "intro-firstrun.docbook">
-  <!ENTITY doc-intro-fileformats      SYSTEM "intro-fileformats.docbook">
+  <!ENTITY doc-intro-imageformats     SYSTEM "intro-imageformats.docbook">
+  <!ENTITY doc-intro-movieformats     SYSTEM "intro-movieformats.docbook">
   <!ENTITY doc-intro-camerasupport    SYSTEM "intro-camerasupport.docbook">
   <!ENTITY doc-intro-pluginsupport    SYSTEM "intro-pluginsupport.docbook">
   <!ENTITY doc-intro-database         SYSTEM "intro-database.docbook">
@@ -127,7 +128,8 @@
 
     &doc-intro-background;
     &doc-intro-firstrun;
-    &doc-intro-fileformats;
+    &doc-intro-imageformats;
+    &doc-intro-movieformats;
     &doc-intro-camerasupport;
     &doc-intro-pluginsupport;
     &doc-intro-database;
diff --git a/digikam/intro-fileformats.docbook 
b/digikam/intro-imageformats.docbook
similarity index 71%
rename from digikam/intro-fileformats.docbook
rename to digikam/intro-imageformats.docbook
index d011f43..08a4445 100644
--- a/digikam/intro-fileformats.docbook
+++ b/digikam/intro-imageformats.docbook
@@ -1,90 +1,89 @@
-<sect1 id="using-fileformat"> <title>Supported File Formats</title>
+<sect1 id="using-imageformats"> <title>Supported Image Formats</title>
 
-    <para>
-    &digikam; relies on a number of libraries and support packages to load and 
save image formats. Which image formats are available will depend on the 
availability of these libraries on your system and, in some cases, on the way 
that those libraries have been compiled. On most distributions you will find 
that a wide range of image formats are viewable within &digikam;.
-    </para>
+    <sect2> <title>Introduction</title>
 
-    <para>
-    This dependence on other libraries means that it is not possible to give a 
definitive list of all of the formats that will be available on your system. At 
the very least JPEG, PNG, and TIFF should be available.
-    </para>
+       <para>
+           &digikam; relies on a number of libraries and support packages to 
load and save image formats. Which image formats are available will depend on 
the availability of these libraries on your system and, in some cases, on the 
way that those libraries have been compiled. On most distributions you will 
find that a wide range of image formats are viewable within &digikam;.
+       </para>
 
-    <para>
-    &digikam; only displays files that are in formats that it understands. It 
does this by looking at the file extension on the files and checking this 
against a predefined list. If the file extension is in the list &digikam; will 
show the file in the Image View, provided the appropriate library is installed. 
You can change the list of file extensions that &digikam; will accept, see the 
<link linkend="using-setup">Configuration</link> section for more details.
-    </para>
+       <para>
+           This dependence on other libraries means that it is not possible to 
give a definitive list of all of the formats that will be available on your 
system. At the very least JPEG, PNG, and TIFF should be available.
+       </para>
 
-    <sect2> <title>Still Photograph Formats</title>
-
-        <sect3> <title>Introduction</title>
+       <para>
+           &digikam; only displays files that are in formats that it 
understands. It does this by looking at the file extension on the files and 
checking this against a predefined list. If the file extension is in the list 
&digikam; will show the file in the Image View, provided the appropriate 
library is installed. You can change the list of file extensions that &digikam; 
will accept, see the <link linkend="using-setup">Configuration</link> section 
for more details.
+        </para>
 
-            <para>
+        <para>
             Almost all digital cameras store photographs in one of two 
formats: JPEG or TIFF. Many cameras enable you to select which of these formats 
to use. A full description of these formats can be found at the <ulink 
url="http://en.wikipedia.org/wiki/Graphics_file_format";>Wikipedia</ulink>. 
&digikam; supports both of these formats.
-            </para>
+        </para>
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>Still Image Compression</title>
+    <sect2> <title>Still Image Compression</title>
 
-            <para>
+        <para>
             Image compression is the application of data compression schemes 
on digital images. It is done through reducing redundancy of the image data in 
order to be able to store or transmit data in an efficient form.
-            </para>
+        </para>
 
-            <para>
+        <para>
             Image compression can be lossy or lossless. Lossless compression 
methods are always preferred for their high preservation value for archival 
purposes before applying transformations like cropping, resizing, color 
corrections, &etc; This is because lossy compression methods, especially when 
used at low bit rates, introduce compression artifacts. Lossy methods are 
suitable for natural images such as photos in applications where minor 
(sometimes imperceptible) loss of fidelity is acceptable to achieve a 
substantial reduction in file size. Lossy compression is good for image 
publishing on the Internet.
-            </para>
+        </para>
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>JPEG</title>
-            <para>
-            JPEG is a compressed format, that trades some of the image quality 
to keep file sizes small. In fact, most cameras save their images in this 
format unless you specify otherwise. A JPEG image is stored using lossy 
compression and you can vary the amount of compression. This allows you to 
choose between lower compression and higher image quality or greater 
compression and poorer quality. The only reason to choose higher compression is 
because it creates smaller file so you can store more images, and it's easier 
to send them by e-mail or post them on the Web. Most cameras give you two or 
three choices equivalent to good, better, best although the names vary.
-            </para>
+    <sect2> <title>JPEG</title>
+        
+        <para>
+           JPEG is a compressed format, that trades some of the image quality 
to keep file sizes small. In fact, most cameras save their images in this 
format unless you specify otherwise. A JPEG image is stored using lossy 
compression and you can vary the amount of compression. This allows you to 
choose between lower compression and higher image quality or greater 
compression and poorer quality. The only reason to choose higher compression is 
because it creates smaller file so you can store more images, and it's easier 
to send them by e-mail or post them on the Web. Most cameras give you two or 
three choices equivalent to good, better, best although the names vary.
+       </para>
             
-            <para>
+        <para>
             JPEG 2000 is supported as well. It provides for the same 
compression ratio the better (smoother) results compared to JPEG. The 2000 
version has the option of being lossless if so specified in the settings.
-            </para>
+        </para>
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>TIFF</title>
+    <sect2> <title>TIFF</title>
 
-            <para>
+        <para>
             TIFF has been widely accepted and widely supported as an image 
format. Commonly, TIFF may be stored by the camera in uncompressed form or 
using lossless compression algorithm (Deflate). It maintains higher image 
quality but at the expense of much larger file sizes. Some cameras let you save 
your images in this format and it is a popular format because of its lossless 
compression algorithm. The problem is that the format has been altered by so 
many people that there are now 50 or more flavors and not all are recognizable 
by programs.
-            </para>
+        </para>
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>PNG</title>
+    <sect2> <title>PNG</title>
 
-            <para>
+        <para>
             PNG is an image format that was developed as a replacement for a 
number of older, in the 1990's widely used, image file formats. It is a 
lossless format like TIFF but it is much more compact and saves disk space. 
Although your camera is unlikely to support PNG, some people like to convert 
their photographs to PNG as soon as they get them on their computer. Unlike 
JPEG, PNG images do not lose quality every time you re-encode them after 
modification. &digikam; fully supports PNG images and the Batch Queue Manager 
can convert a batch of images from any supported format to PNG (and other 
formats) in one step.
-            </para>
+        </para>
 
-            <para>
+        <para>
             PNG is an extensible file format for the lossless, portable, 
well-compressed storage of raster images. PNG provides a patent-free 
replacement for &GIF; and can also replace many common uses of TIFF. PNG is 
designed to work well in on-line viewing applications, such as the World Wide 
Web, so it is fully streamable with a progressive display option. Also, PNG can 
store gamma and chromaticity data for improved color matching on heterogeneous 
platforms. PNG supports 8 and 16 bits / colors /pixels depth. It's the perfect 
file format to archive your photographs. For more information about the PNG 
format see the <ulink url="http://www.libpng.org/pub/png/";>PNG homepage</ulink>.
-            </para>
+        </para>
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>PGF</title>
+    <sect2> <title>PGF</title>
 
-            <para>
+        <para>
             "Progressive Graphics File" is another not so known but open file 
image format. Wavelet-based, it allows lossless and lossy data compression. PGF 
compares well with JPEG 2000 but it was developed for speed 
(compression/decompression) rather than to be the best at compression ratio. At 
the same file size a PGF file looks significantly better than a JPEG one, while 
remaining very good at progressive display too. Thus it should be well-suited 
to the web but at the moment few browsers can display it. For more information 
about the PGF format see the <ulink url="http://www.libpgf.org/";>libPGF 
homepage</ulink>.
-            </para> 
+        </para> 
 
-        </sect3>
+    </sect2>
 
-        <sect3> <title>RAW</title>
+    <sect2> <title>RAW</title>
 
-            <para>
+        <para>
             Some, typically more expensive, cameras allow you to store images 
in RAW format. RAW format is not really an image standard at all. It is 
different for every make of camera. RAW format images contain all the data that 
is taken directly from the camera's image sensor before the software in the 
camera applies things like white balance, sharpening &etc; Storing  photographs 
in a camera's RAW format allows you to alter settings, such as white balance, 
after the photograph has been taken. Most professional photographers use RAW 
format, because it offers them maximum flexibility. The downside is that RAW 
image files can be very large indeed.
-            </para>
+        </para>
 
-            <para>
+        <para>
             If you want to learn more about RAW image format visit the very 
helpful guides<ulink url="http://en.wikipedia.org/wiki/RAW_image_format";> 
Wikipedia,</ulink> <ulink 
url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml";>
 The Luminous Landscape,</ulink> and <ulink 
url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm";> Cambridge 
in Colour</ulink>. You can convert RAW format images into JPEG, PNG, or TIFF in 
&digikam; using the <link linkend="raw-workflow">Image Editor</link>.
-            </para>
+        </para>
 
-            <para>
-                &digikam; supports RAW image loading only, relying on the 
<ulink url="http://www.libraw.org";>Libraw library</ulink> which is included in 
&digikam; core and supports over 800 RAW file formats. All supported cameras 
are listed at the bottom of <ulink 
url="http://www.cybercom.net/~dcoffin/dcraw";> Dave Coffin's</ulink> web page. 
The table below shows a short list of camera RAW files supported by &digikam;:
+        <para>
+            &digikam; supports RAW image loading only, relying on the <ulink 
url="http://www.libraw.org";>Libraw library</ulink> which is included in 
&digikam; core and supports over 800 RAW file formats. All supported cameras 
are listed at the bottom of <ulink 
url="http://www.cybercom.net/~dcoffin/dcraw";> Dave Coffin's</ulink> web page. 
The table below shows a short list of camera RAW files supported by &digikam;:
 
             <informaltable><tgroup cols="2">
 
@@ -224,23 +223,12 @@
                     Ricoh RAW format
                     </entry></row>
 
-
                 </tbody>
 
             </tgroup></informaltable>
 
-            </para>
-
-        </sect3>
-
-    </sect2>
-
-    <sect2> <title>Moving Image Formats (Videos)</title>
-
-        <para>
-        Many digital cameras support taking of short movie clips. These clips 
are usually stored in AVI or MP4 format. &digikam; understands these formats 
and will generate thumbnails for the movie files. However, &digikam; is not a 
movie editing application and it does not have any built-in movie viewing or 
editing capabilities. If you double click on a movie file &digikam; you can 
preview video or choose a viewing application through your desktop settings.
         </para>
-    
+
     </sect2>
 
 </sect1>
diff --git a/digikam/intro-movieformats.docbook 
b/digikam/intro-movieformats.docbook
new file mode 100644
index 0000000..899bdb5
--- /dev/null
+++ b/digikam/intro-movieformats.docbook
@@ -0,0 +1,38 @@
+<sect1 id="using-movieformats"> <title>Supported Movie Formats</title>
+
+    <sect2> <title>Introduction</title>
+
+       <para>
+           Many digital cameras support taking of short movie clips. 
+           These clips are usually stored in AVI or MP4 format. 
+           &digikam; understands metadata from these formats and will generate 
+           thumbnails for the movie files. 
+           However, &digikam; is not a movie editing application and it does 
not have any 
+           built-in movie viewing or editing capabilities. 
+           If you double click on a movie file &digikam; you can preview video 
+           or choose a viewing application through your desktop settings.
+       </para>
+
+    </sect2>
+
+    <sect2> <title>Video Formats</title>
+
+        <para>
+           &digikam; relies on Qt5Multimedia framework to handle video files. 
+           This framework will able to play video files depending on the 
availability of video codec 
+           installed on your system. &digikam; do not include extra video 
codec.
+           On Linux desktop, this framework will use GStreamer backend.
+           On other desktop operating system, you will need to install extra 
video codecs.
+        </para>
+    
+    </sect2>
+
+</sect1>
+ 
+<!--
+Local Variables:
+mode: sgml
+sgml-omittag: nil
+sgml-shorttag: t
+End:
+-->
diff --git a/showfoto/index.docbook b/showfoto/index.docbook
index 659de19..36555c3 100644
--- a/showfoto/index.docbook
+++ b/showfoto/index.docbook
@@ -9,7 +9,7 @@
   <!ENTITY digikam-app '<application>digiKam</application>'>
   <!ENTITY path "../digikam/"><!-- relative path to snapshots for showfoto -->
 
-  <!ENTITY doc-intro-fileformats       SYSTEM 
"../digikam/intro-fileformats.docbook">
+  <!ENTITY doc-intro-imageformats      SYSTEM 
"../digikam/intro-imageformats.docbook">
   <!ENTITY doc-using-sidebar           SYSTEM 
"../digikam/using-sidebar.docbook">
   <!ENTITY doc-editor-photoediting     SYSTEM 
"../digikam/editor-photoediting.docbook">
   <!ENTITY doc-editor-color            SYSTEM 
"../digikam/editor-color.docbook">
@@ -136,7 +136,7 @@
 
     </sect1>
 
-    &doc-intro-fileformats;
+    &doc-intro-imageformats;
 
 </chapter>
 

Reply via email to